vue2-client 1.8.339 → 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.339",
+  "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/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -170,7 +170,7 @@ export default {
     change (value) {
       if (this.readOnlyDivisions && !this.divisionsChange) {
         // 如果省市区街道信息禁止修改
-        if (this.divisions.str && !this.addressInput.startsWith(this.divisions.str)) {
+        if (this.addressInput.includes('省') && this.addressInput.includes('市') && this.divisions.str && !this.addressInput.startsWith(this.divisions.str)) {
           this.addressInput = this.addressObj.address
           this.$message.info('省市区街道信息请从选择新地址以变更')
           return

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/base-client/components/system/LogDetailsView/LogDetailsView.vue

@@ -85,7 +85,7 @@
         </div>
 
         <!-- actions -->
-        <template v-slot:extra>
+        <template #extra>
           <a-button-group style="margin-right: 4px;">
             <a-button type="dashed" @click="initView" :loading="loadLogDetails">刷新</a-button>
           </a-button-group>
@@ -137,26 +137,26 @@ import { mapState } from 'vuex'
 import XBadge from '@vue2-client/base-client/components/common/XBadge'
 
 const statusIconMap = {
-  '待办的': {
+  待办的: {
     icon: 'info-circle',
     style: 'color: #fe7300;'
   },
-  '进行中': {
+  进行中: {
     icon: 'clock-circle',
     style: 'color: #2d81d7;'
   },
-  '已完成': {
+  已完成: {
     icon: 'check-circle',
     style: 'color:#4baf50;'
   },
-  '已关闭': {
+  已关闭: {
     icon: 'issues-close',
     style: 'color:#ec0019;'
   }
 }
 
 const eventIconMap = {
-  '开始处理事件': {
+  开始处理事件: {
     icon: 'forward',
     style: 'color: #fe7300;'
   },
@@ -168,7 +168,7 @@ const eventIconMap = {
     icon: 'issues-close',
     style: 'color:#ec0019;'
   },
-  '已完成对事件的处理': {
+  已完成对事件的处理: {
     icon: 'check-circle',
     style: 'color:#4baf50;'
   }

package/src/base-client/components/ticket/TicketDetailsView/TicketDetailsView.vue

@@ -92,7 +92,7 @@
           </div>
         </div>
         <!-- 按钮 -->
-        <template v-slot:extra>
+        <template #extra>
           <a-button-group style="margin-right: 4px;">
             <a-popover placement="bottomLeft" title="开始处理">
               <template slot="content">
@@ -122,20 +122,20 @@
         <a-card :bordered="false" style="margin-top: 40px">
           <a-steps :current="step" :direction="'horizontal'">
             <a-step>
-              <template v-slot:title><span>待处理</span></template>
-              <template v-slot:description>
+              <template #title><span>待处理</span></template>
+              <template #description>
                 <div>工单已提交，等待处理<div>{{ format(details.created_time,'yyyy-MM-dd hh:mm:ss') }}</div></div>
               </template>
             </a-step>
             <a-step>
-              <template v-slot:title><span>处理中</span></template>
-              <template v-slot:description>
+              <template #title><span>处理中</span></template>
+              <template #description>
                 <div v-if="step >= 1"><strong>{{ details.name }}</strong> 处理中...<div>{{ format(details.confirm_time,'yyyy-MM-dd hh:mm:ss') }}</div></div>
               </template>
             </a-step>
             <a-step>
-              <template v-slot:title><span>{{ getStatus() }}</span></template>
-              <template v-slot:description>
+              <template #title><span>{{ getStatus() }}</span></template>
+              <template #description>
                 <div v-if="step >= 2">{{ format(details.finished_time,'yyyy-MM-dd hh:mm:ss') }}</div>
               </template>
             </a-step>
@@ -532,7 +532,7 @@
       },
       // 转移工单确认后逻辑
       handleTransferOk () {
-        this.$refs['transmitFormRef'].validate().then(() => {
+        this.$refs.transmitFormRef.validate().then(() => {
           post(TicketDetailsViewApi.transferTicketToOthers, {
             ticketId: this.ticketId,
             endTime: this.format(new Date(), 'yyyy-MM-dd hh:mm:ss'),
@@ -548,7 +548,7 @@
                   5
                 )
                 this.fileList = []
-                this.$refs['transmitFormRef'].resetFields()
+                this.$refs.transmitFormRef.resetFields()
               } else {
                 this.$message.error('工单已被他人处理或关闭，请刷新再试', 5)
               }
@@ -563,7 +563,7 @@
       // 转移工单取消后逻辑
       handleTransferCancel () {
         this.transVisible = false
-        this.$refs['transmitFormRef'].resetFields()
+        this.$refs.transmitFormRef.resetFields()
       },
       // 关闭抽屉时回调
       onClose () {

package/src/base-client/components/ticket/TicketSubmitSuccessView/TicketSubmitSuccessView.vue

@@ -114,7 +114,7 @@ function getBase64 (file) {
 const AStepItemGroup = AStepItem.Group
 const DetailListItem = DetailList.Item
 export default {
-  name: 'submitTicketSuccess',
+  name: 'SubmitTicketSuccess',
   components: { AStepItemGroup, AStepItem, DetailListItem, DetailList, Result },
   data () {
     return {

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,84 +1,71 @@
 <template>
-  <a-card id="test">
-    <!--    <XFormTable query-params-name="planMangeV4TestCRUD" service-name="af-safecheck" style="margin-bottom: 5%"/>-->
-    <!--  修改 import 路径展示不同的组件 Demo  -->
-    <Demo1
-      :data-content="dataContent"
-      data-config-name="planManagementSimpleDescConfig"
-      service-name="af-safecheck"/>
+  <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 XReport from '@vue2-client/base-client/components/common/XReport'
-// 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: {
-    Demo1,
-    XReport,
     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

@@ -3,11 +3,12 @@ import { post } from '@vue2-client/services/api'
 
 // 避免重复请求相同配置key的锁
 const locks = {}
+let currentDbVersion = 1
 
 export const indexedDB = {
   db: undefined,
-  indexedDB: window.indexedDB || window.webkitindexedDB,
-  IDBKeyRange: window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
+  indexedDB: window?.rawWindow?.indexedDB || window.indexedDB || window.webkitindexedDB,
+  IDBKeyRange: window?.rawWindow?.IDBKeyRange || window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
   openDB: function (callback) {
     const self = this
     if (self.db) {
@@ -56,10 +57,11 @@ export const indexedDB = {
       })
     }
   },
-  openDatabase: function () {
+  openDatabase () {
     const self = this
+
     return new Promise((resolve, reject) => {
-      const request = self.indexedDB.open('view', 1)
+      const request = self.indexedDB.open('view', currentDbVersion)
 
       request.onerror = function (e) {
         reject(e.currentTarget.error)
@@ -67,20 +69,19 @@ export const indexedDB = {
 
       request.onsuccess = function (e) {
         const db = e.target.result
-        // 检查并创建 metaCache 对象存储空间
         if (!db.objectStoreNames.contains('metaCache')) {
-          const version = db.version + 1
           db.close()
-          const newRequest = self.indexedDB.open('view', version)
-          newRequest.onupgradeneeded = function (e) {
-            const newDb = e.target.result
-            newDb.createObjectStore('metaCache', { keyPath: 'key' })
+          currentDbVersion = db.version + 1
+          const upgradeRequest = self.indexedDB.open('view', currentDbVersion)
+          upgradeRequest.onupgradeneeded = function (event) {
+            const upgradeDb = event.target.result
+            upgradeDb.createObjectStore('metaCache', { keyPath: 'key' })
           }
-          newRequest.onsuccess = function (e) {
-            resolve(e.target.result)
+          upgradeRequest.onsuccess = function (event) {
+            resolve(event.target.result)
           }
-          newRequest.onerror = function (e) {
-            reject(e.currentTarget.error)
+          upgradeRequest.onerror = function (event) {
+            reject(event.currentTarget.error)
           }
         } else {
           resolve(db)