vue2-client 1.8.340 → 1.8.341

package/.env

@@ -14,6 +14,6 @@ VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
 VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
-VUE_APP_SYSTEM_NAME=af-system
+VUE_APP_SYSTEM_NAME=af-revenue
 VUE_APP_LOGIN_VERSION=V4
 

package/package.json

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

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

@@ -47,7 +47,7 @@
             <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
             <a-tooltip title="汇总" placement="bottom">
               <a-button @click="showDrawer">
-                <a-icon :style="iconStyle" type="container"/>
+                <a-icon :style="iconStyle" type="project"/>
               </a-button>
             </a-tooltip>
             <a-tooltip title="重新查询" placement="bottom">
@@ -75,6 +75,7 @@
         :rowSelection="rowSelection"
         :scroll="{ x: scrollXWidth, y: scrollYHeight }"
         :showPagination="showPagination"
+        :setScrollYHeight="setScrollYHeight"
         size="default"
       >
         <template
@@ -154,7 +155,7 @@
             :title="f.title + '：'"
             :value="f.value"
             :precision="2"
-            style="margin-right: 50px" />
+            style="margin-right: 50px"/>
         </div>
       </template>
     </a-drawer>
@@ -177,7 +178,14 @@ import { formatDate } from '@vue2-client/utils/util'
 import XBadge from '@vue2-client/base-client/components/common/XBadge'
 import TableSetting from '@vue2-client/components/TableSetting/TableSetting'
 import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
-import { exportData, query, querySummary, queryWithResource, remove, asyncRunTask } from '@vue2-client/services/api/common'
+import {
+  exportData,
+  query,
+  querySummary,
+  queryWithResource,
+  remove,
+  asyncRunTask
+} from '@vue2-client/services/api/common'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
 import { Modal } from 'ant-design-vue'
 import { post } from '@vue2-client/services/api'
@@ -350,7 +358,6 @@ export default {
     ...mapState('setting', ['compatible'])
   },
   mounted () {
-    this.setScrollYHeight({}) // 初始化时也调用一次，确保加载时高度正确
     window.addEventListener('resize', this.handleResize)
   },
   beforeDestroy () {
@@ -450,8 +457,6 @@ export default {
         this.clearRowKeys()
       }
       this.$emit('afterQuery', result, requestParameters.conditionParams)
-      // 设置表格高度为固定值
-      this.setScrollYHeight({ type: 'default' })
       return result
     },
     /**
@@ -503,18 +508,20 @@ export default {
     },
     setScrollYHeight ({ extraHeight = this.extraHeight, id = this.uniqueId, type = '' }) {
       this.$nextTick(() => {
+        const curDocument = window?.rawDocument || document
         if (typeof extraHeight == 'undefined') {
           //  默认底部分页32 + 边距48
           extraHeight = 48 + 32
         }
         let tHeader = null
         if (id) {
-          tHeader = document.getElementById(id) ? document.getElementById(id).getElementsByClassName('ant-table-thead')[0] : null
+          tHeader = curDocument.getElementById(id) ? curDocument.getElementById(id).getElementsByClassName('ant-table-thead')[0] : null
         } else {
-          tHeader = document.getElementsByClassName('ant-table-thead')[0]
+          tHeader = curDocument.getElementsByClassName('ant-table-thead')[0]
         }
         // 表格内容距离顶部的距离
         let tHeaderBottom = 0
+        console.log(tHeader, tHeader.getBoundingClientRect())
         if (tHeader) {
           tHeaderBottom = tHeader.getBoundingClientRect().bottom
         }
@@ -532,12 +539,15 @@ export default {
           if (tHeader) {
             modalElement = tHeader.closest('.ant-modal-body')
           } else {
-            modalElement = document.querySelector('.ant-modal-body')
+            modalElement = curDocument.querySelector('.ant-modal-body')
           }
+          console.log(modalElement)
           if (modalElement) {
             const modalRect = modalElement.getBoundingClientRect()
             // 48 是 modal 通常的边距 32 是分页
-            extraHeight = window.innerHeight - modalRect.bottom + 32 + 48
+            const innerHeight = window?.rawWindow?.innerHeight || window.innerHeight || 0
+            console.log(tHeaderBottom, modalRect.bottom)
+            extraHeight = innerHeight - modalRect.bottom + 32 + 48
           }
         }
         // 窗体高度-表格内容顶部的高度-表格内容底部的高度

package/src/components/STable/index.js

@@ -26,6 +26,10 @@ export default {
       type: Function,
       required: true
     },
+    setScrollYHeight: {
+      type: Function,
+      required: true
+    },
     pageNum: {
       type: Number,
       default: 1
@@ -191,8 +195,10 @@ export default {
           }
           this.localDataSource = r.data // 返回结果中的数组数据
           this.localLoading = false
+          this.setScrollYHeight({ type: 'default' })
         }, () => {
           this.localLoading = false
+          this.setScrollYHeight({ type: 'default' })
         })
       }
     },
@@ -332,10 +338,23 @@ export default {
         <a-col flex="0 0">
           <a-pagination
             total={this.localPagination.total}
-            onChange={(page, pageSize) => this.loadData({
-              current: page,
-              pageSize: pageSize
-            })
+            onChange={(page, pageSize) => {
+              this.pageSize = pageSize
+              this.pageNum = page
+              this.loadData({
+                current: page,
+                pageSize: pageSize
+              })
+            }
+            }
+            onShowSizeChange={(page, pageSize) => {
+              this.pageSize = pageSize
+              this.pageNum = page
+              this.loadData({
+                current: page,
+                pageSize: pageSize
+              })
+            }
             }
             show-total={(total, range) => range[0] === range[1] ? `${range[0]} | 共 ${total} 项` : `${range[0]}-${range[1]} | 共 ${total} 项`}
             default-current={this.localPagination.current}

package/src/pages/Example/index.vue

@@ -1,81 +1,71 @@
 <template>
-  <a-card id="test">
-    <!--    <XFormTable query-params-name="planMangeV4TestCRUD" service-name="af-safecheck" style="margin-bottom: 5%"/>-->
-    <!--  修改 import 路径展示不同的组件 Demo  -->
-    <Demo />
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例表单查询"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      @action="action"
+      ref="xFormTable">
+    </x-form-table>
+    <a-drawer
+      title="详情信息"
+      placement="right"
+      :destroy-on-close="true"
+      width="85vw"
+      :closable="false"
+      :visible="detailVisible"
+      @close="onClose">
+      <span>
+        详情表单内容
+      </span>
+    </a-drawer>
   </a-card>
 </template>
 
 <script>
-import Demo from '@vue2-client/base-client/components/common/AddressSearchCombobox/demo.vue'
-// import Demo from '@vue2-client/base-client/components/common/XFormGroup/demo.vue'
-// import Demo from '@vue2-client/base-client/components/common/XDescriptions/demo.vue'
-// import Demo from '@vue2-client/base-client/components/common/AddressSearchCombobox/demo.vue'
-// import Demo from '@vue2-client/base-client/components/common/XFormTable/demo.vue'
-// import Demo from '@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'
-import Demo1 from '@vue2-client/base-client/components/common/XSimpleDescriptions/XSimpleDescriptions.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { mapState } from 'vuex'
 
 export default {
-  name: 'Example',
+  name: 'ChargeQuery',
   components: {
-    Demo,
-    Demo1,
     XFormTable
   },
-  mounted () {
-  },
   data () {
     return {
-      descConfig: [
-        {
-          label: '计划用户总数',
-          key: 'totalUser'
-        },
-        {
-          label: '计划小区数',
-          key: 'totalResidentArea'
-        },
-        {
-          label: '已检数',
-          key: 'doneNum'
-        },
-        {
-          label: '未检数',
-          key: 'todoNum'
-        },
-        {
-          label: '安检率',
-          key: 'ratio',
-          type: 'percent'
-        }
-      ],
-      descData: {
-        totalUser: 1000,
-        totalResidentArea: 6,
-        doneNum: 800,
-        todoNum: 200,
-        ratio: 80
-      },
-      dataContent: {
-        c_id: '1240d022903c46c8a510b1f9e61f1ca2',
-        c_usertype: '民用',
-        c_plantype: '预约计划',
-        c_checker: 'wd7',
-        c_total: 2,
-        c_done: 1,
-        c_ratio: 50,
-        c_planname: '状态测试',
-        c_month: 8,
-        todoNum: 1,
-        totalResidentArea: 1
-      }
+      // 查询配置名称
+      queryParamsName: 'ChargeQueryCRUD',
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
     }
   },
+  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)
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
 }
 </script>
+
 <style scoped>
 
 </style>

package/src/utils/indexedDB.js

@@ -167,9 +167,6 @@ export const indexedDB = {
     })
   },
   getByWeb: function (key, url, params, callback, processFun) {
-    console.log('db', this.db)
-    console.log(key)
-    console.log(locks)
     // 如果这个键正在被使用，等待它完成
     if (locks[key]) {
       locks[key].then(() => {