vue2-client 1.8.209-p → 1.8.211

package/package.json

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

package/src/base-client/components/common/XForm/XForm.vue

@@ -219,7 +219,7 @@ export default {
     },
     toggleAdvanced () {
       this.advanced = !this.advanced
-      this.$emit('toggleAdvanced', this.advanced)
+      this.$emit('toggleAdvanced')
     },
     toggleVisible () {
       this.visible = !this.visible

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -446,23 +446,15 @@ export default {
     /**
      * 更多条件是否展示
      */
-    toggleAdvanced (visible) {
-      let height = visible ? 'calc(100vh - 33.7rem)' : 'default'
-      if (visible && window.__MICRO_APP_ENVIRONMENT__) {
-        height = 'calc(100vh - 28rem)'
-      }
-      this.$refs.xTable.setScrollYHeight(height)
+    toggleAdvanced () {
+      this.$refs.xTable.setScrollYHeight({})
     },
     /**
      * 查询表单部分显示/隐藏切换
      */
     toggleIsFormShow () {
-      const visible = this.$refs.xForm.toggleVisible()
-      let height = visible ? 'default' : 'calc(100vh - 27rem)'
-      if (!visible && window.__MICRO_APP_ENVIRONMENT__) {
-        height = 'calc(100vh - 22rem)'
-      }
-      this.$refs.xTable.setScrollYHeight(height)
+      this.$refs.xForm.toggleVisible()
+      this.$refs.xTable.setScrollYHeight({})
     },
     /**
      * 选择列事件

package/src/base-client/components/common/XTable/XTable.vue

@@ -55,6 +55,7 @@
     </a-row>
     <s-table
       ref="table"
+      id="XTable"
       :alert="true"
       :columns="tableColumns"
       :data="loadData"
@@ -310,7 +311,7 @@ export default {
         }
       }
       // 设置表格高度为固定值
-      this.setScrollYHeight('default')
+      this.setScrollYHeight({ type: 'default' })
       // 横向滚动长度大于所有宽度，才能实现固定表头
       this.scrollXWidth = totalWidth
       // 加载筛选列完成
@@ -379,14 +380,37 @@ export default {
         this.$refs.table.refresh(bool)
       })
     },
-    setScrollYHeight (value) {
-      if (value === 'default') {
-        value = 'calc(100vh - 31rem)'
-        if (window.__MICRO_APP_ENVIRONMENT__) {
-          value = 'calc(100vh - 27.5rem)'
+    setScrollYHeight ({ extraHeight = 80, id = 'XTable', type = '' }) {
+      this.$nextTick(() => {
+        if (typeof extraHeight == 'undefined') {
+          //  默认底部分页32 + 边距48
+          extraHeight = 48 + 32
         }
-      }
-      this.scrollYHeight = value
+        let tHeader = null
+        console.log(document.getElementById(id))
+        if (id) {
+          tHeader = document.getElementById(id) ? document.getElementById(id).getElementsByClassName('ant-table-thead')[0] : null
+        } else {
+          tHeader = document.getElementsByClassName('ant-table-thead')[0]
+        }
+        // 表格内容距离顶部的距离
+        let tHeaderBottom = 0
+        if (tHeader) {
+          console.log(tHeader.getBoundingClientRect())
+          tHeaderBottom = tHeader.getBoundingClientRect().bottom
+        }
+        if (tHeaderBottom === 0) {
+            this.scrollYHeight = 'calc(100vh - 31rem)'
+            if (window.__MICRO_APP_ENVIRONMENT__) {
+              this.scrollYHeight = 'calc(100vh - 28.5rem)'
+            }
+            return
+        }
+        // 窗体高度-表格内容顶部的高度-表格内容底部的高度
+        // this.scrollYHeight = document.body.clientHeight - tHeaderBottom - extraHeight
+        console.log(`calc(100vh - ${tHeaderBottom + extraHeight}px)`)
+        this.scrollYHeight = `calc(100vh - ${tHeaderBottom + extraHeight}px)`
+      })
     },
     /**
      * 格式化日期

package/src/pages/Example/index.vue

@@ -1,74 +1,578 @@
 <template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="示例表单查询"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      @action="action"
-      serviceName="af-apply"
-      ref="xFormTable">
-    </x-form-table>
-    <a-drawer
-      title="详情信息"
-      placement="right"
-      :destroy-on-close="true"
-      :width="isMobile ? screenWidth : screenWidth * 0.85"
-      :closable="false"
-      :visible="detailVisible"
-      @close="onClose">
-      <span>
-        详情表单内容
-      </span>
-    </a-drawer>
-  </a-card>
+  <div id="test">
+    <XReport config-name="report_ticket" :local-config="test" :config-data="test.testJsonData" :dont-format="true"/>
+    <a-button @click="testExport">导出</a-button>
+  </div>
 </template>
 
 <script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { mapState } from 'vuex'
+import XReport from '@vue2-client/base-client/components/common/XReport'
+import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
 
 export default {
-  name: 'example(需要修改)',
+  name: 'Example',
   components: {
-    XFormTable
+    XReport
   },
+  mounted () {
+    console.log(this.$route)
+    },
   data () {
     return {
-      // 查询配置名称
-      queryParamsName: 'CRUD_SERVICE_DETAILS',
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
+      test: {
+        slotsDeclare: [],
+        data: {
+          'serviceall@@@baseuserinfo@@@f_user_name': '',
+          images: {},
+          'serviceall@@@f_new_failure': '',
+          'usermeter@@@f_meternumber': '',
+          'usermeter@@@f_meter_style': '',
+          'usermeter@@@f_meter_brand': '',
+          'serviceall@@@f_date_leave': '',
+          'serviceall@@@f_remarks': '',
+          'serviceall@@@baseuserinfo@@@f_userinfo_code': '',
+          'serviceall@@@f_date_come': '',
+          'serviceall@@@baseuserinfo@@@f_address': '',
+          f_total_feeORf_total_gas: '',
+          'usermeter@@@f_aroundmeter': ''
+        },
+        columns: [
+          [
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '用户名称',
+              originalRowIndex: 0,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 4,
+              dataIndex: 'serviceall@@@baseuserinfo@@@f_user_name',
+              originalRowIndex: 0,
+              type: 'input',
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '用户编号',
+              originalRowIndex: 0,
+              type: 'column',
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 4,
+              dataIndex: 'serviceall@@@baseuserinfo@@@f_userinfo_code',
+              originalRowIndex: 0,
+              type: 'input',
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '详细地址',
+              originalRowIndex: 1,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 10,
+              dataIndex: 'serviceall@@@baseuserinfo@@@f_address',
+              originalRowIndex: 1,
+              type: 'input',
+              originalCellIndex: 2
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '故障明细',
+              originalRowIndex: 2,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              customFunction: "function (val) {\n    let failureall=''\n    let failure = JSON@@@parse(val)\n    for (let i = 0; i <failure@@@length; i++) {\n        if (failure[i]@@@failurecase@@@length>0){\n        failureall+=failure[i]@@@f_failure_type+\":\"\n        for (let j = 0; j < failure[i]@@@failurecase@@@length; j++) {\n            failureall+=failure[i]@@@failurecase[j]\n            if (j+1!=failure[i]@@@failurecase@@@length){\n            failureall+=\",\"\n            }\n        }\n\n        }else{\n        failureall+=failure[i]@@@f_failure_type\n        }\n        if (i+1!=failure@@@length){\n        failureall+=';'\n        }\n    }\n    return failureall\n}",
+              colSpan: 10,
+              dataIndex: 'serviceall@@@f_new_failure',
+              originalRowIndex: 2,
+              type: 'input',
+              originalCellIndex: 2
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              customFunction: "function (val, config) {\n  return config.data.usermeter.f_collection_type === '按金额' ? '累购金额' : '累购气量'\n}",
+              colSpan: 2,
+              text: '累购金额or累购气量',
+              originalRowIndex: 3,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              dynamicDataIndex: true,
+              colSpan: 4,
+              dataIndex: 'f_total_feeORf_total_gas',
+              customFunctionForDynamicDataIndex: "function (config) {\n  if(config.data.usermeter.f_collection_type === '按金额') {\n    return 'usermeter@@@f_total_fee'\n  }else {\n    return 'usermeter@@@f_total_gas'\n  }\n}",
+              originalRowIndex: 3,
+              type: 'input',
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '左右表',
+              originalRowIndex: 3,
+              type: 'column',
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 4,
+              dataIndex: 'usermeter@@@f_aroundmeter',
+              originalRowIndex: 3,
+              type: 'input',
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '表号',
+              originalRowIndex: 4,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 10,
+              dataIndex: 'usermeter@@@f_meternumber',
+              originalRowIndex: 4,
+              type: 'input',
+              originalCellIndex: 2
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '表品牌',
+              originalRowIndex: 5,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              dynamicDataIndex: false,
+              colSpan: 4,
+              dataIndex: 'usermeter@@@f_meter_brand',
+              originalRowIndex: 5,
+              type: 'input',
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '表型号',
+              originalRowIndex: 5,
+              type: 'column',
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 4,
+              dataIndex: 'usermeter@@@f_meter_style',
+              originalRowIndex: 5,
+              type: 'input',
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '到达时间',
+              originalRowIndex: 6,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 4,
+              dataIndex: 'serviceall@@@f_date_come',
+              originalRowIndex: 6,
+              type: 'input',
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '离开时间',
+              originalRowIndex: 6,
+              type: 'column',
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 4,
+              dataIndex: 'serviceall@@@f_date_leave',
+              originalRowIndex: 6,
+              type: 'input',
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              colSpan: 2,
+              text: '备注',
+              originalRowIndex: 7,
+              type: 'column',
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              dataIndexType: 'String',
+              colSpan: 10,
+              dataIndex: 'serviceall@@@f_remarks',
+              originalRowIndex: 7,
+              type: 'input',
+              originalCellIndex: 2
+            }
+          ]
+        ],
+        title: '客户工单信息',
+        slotsDefine: {},
+        testJsonData: {
+          usermeter: {
+            f_collection_type: '按气量',
+            f_total_gas: '总气量',
+            f_total_fee: '总金额'
+          }
+        },
+        subTitle: [],
+        width: 'auto',
+        labelStyle: {
+          backgroundColor: 'rgb(247,247,247)',
+          fontWeight: 'bold'
+        },
+        style: {},
+        designMode: 'VisualTable',
+        $globalProp: {
+          environment: 'dev',
+          module: 'null',
+          tenantAlias: 'standard',
+          version: '2',
+          namespaceName: 'af-apply'
+        },
+        table: [
+          [
+            {
+              rowSpan: 1,
+              def: {
+                text: '用户名称',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 0,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'serviceall@@@baseuserinfo@@@f_user_name',
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 0,
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              def: {
+                text: '用户编号',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 0,
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'serviceall@@@baseuserinfo@@@f_userinfo_code',
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 0,
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              def: {
+                text: '详细地址',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 1,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'serviceall@@@baseuserinfo@@@f_address',
+                type: 'input'
+              },
+              colSpan: 10,
+              originalRowIndex: 1,
+              originalCellIndex: 2
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              def: {
+                text: '故障明细',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 2,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                customFunction: "function (val) {\n    let failureall=''\n    let failure = JSON@@@parse(val)\n    for (let i = 0; i <failure@@@length; i++) {\n        if (failure[i]@@@failurecase@@@length>0){\n        failureall+=failure[i]@@@f_failure_type+\":\"\n        for (let j = 0; j < failure[i]@@@failurecase@@@length; j++) {\n            failureall+=failure[i]@@@failurecase[j]\n            if (j+1!=failure[i]@@@failurecase@@@length){\n            failureall+=\",\"\n            }\n        }\n\n        }else{\n        failureall+=failure[i]@@@f_failure_type\n        }\n        if (i+1!=failure@@@length){\n        failureall+=';'\n        }\n    }\n    return failureall\n}",
+                dataIndex: 'serviceall@@@f_new_failure',
+                type: 'input'
+              },
+              colSpan: 10,
+              originalRowIndex: 2,
+              originalCellIndex: 2
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              def: {
+                customFunction: "function (val, config) {\n  return config.data.usermeter.f_collection_type === '按金额' ? '累购金额' : '累购气量'\n}",
+                text: '累购金额or累购气量',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 3,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dynamicDataIndex: true,
+                dataIndex: 'f_total_feeORf_total_gas',
+                customFunctionForDynamicDataIndex: "function (config) {\n  if(config.data.usermeter.f_collection_type === '按金额') {\n    return 'usermeter@@@f_total_fee'\n  }else {\n    return 'usermeter@@@f_total_gas'\n  }\n}",
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 3,
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              def: {
+                text: '左右表',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 3,
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'usermeter@@@f_aroundmeter',
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 3,
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              def: {
+                text: '表号',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 4,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'usermeter@@@f_meternumber',
+                type: 'input'
+              },
+              colSpan: 10,
+              originalRowIndex: 4,
+              originalCellIndex: 2
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              def: {
+                text: '表品牌',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 5,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dynamicDataIndex: false,
+                dataIndex: 'usermeter@@@f_meter_brand',
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 5,
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              def: {
+                text: '表型号',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 5,
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'usermeter@@@f_meter_style',
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 5,
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              def: {
+                text: '到达时间',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 6,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'serviceall@@@f_date_come',
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 6,
+              originalCellIndex: 2
+            },
+            {
+              rowSpan: 1,
+              def: {
+                text: '离开时间',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 6,
+              originalCellIndex: 6
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'serviceall@@@f_date_leave',
+                type: 'input'
+              },
+              colSpan: 4,
+              originalRowIndex: 6,
+              originalCellIndex: 8
+            }
+          ],
+          [
+            {
+              rowSpan: 1,
+              def: {
+                text: '备注',
+                type: 'column'
+              },
+              colSpan: 2,
+              originalRowIndex: 7,
+              originalCellIndex: 0
+            },
+            {
+              rowSpan: 1,
+              def: {
+                dataIndexType: 'String',
+                dataIndex: 'serviceall@@@f_remarks',
+                type: 'input'
+              },
+              colSpan: 10,
+              originalRowIndex: 7,
+              originalCellIndex: 2
+            }
+          ]
+        ],
+        $configProp: {}
+      }
     }
   },
-  created () {
-  },
-  mounted () {
-    console.log('==当前登录人', this.currUser)
-  },
   methods: {
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
+    testExport () {
+      exportHTMLNodeToPDF('123', '#test')
     }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
+  }
 }
 </script>
-
 <style scoped>
 
 </style>