vue2-client 1.18.29 → 1.18.31

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

@@ -69,6 +69,7 @@
             :autoSave="autoSave"
             :extraHeight="extraHeight"
             :serviceName="serviceName"
+            :defaultPageSize="defaultPageSize"
             :pageMaxSize="realQueryConfig.queryPagesSize"
             :externalSelectedRowKeys="externalSelectedRowKeys"
             :customPagination="customPagination"
@@ -139,6 +140,7 @@
               :autoSave="autoSave"
               :extraHeight="extraHeight"
               :serviceName="serviceName"
+              :defaultPageSize="defaultPageSize"
               :pageMaxSize="realQueryConfig.queryPagesSize"
               :externalSelectedRowKeys="externalSelectedRowKeys"
               :customPagination="customPagination"
@@ -210,17 +212,17 @@ import XAddReport from '@vue2-client/base-client/components/common/XAddReport'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XTree from '@vue2-client/base-client/components/common/XTree'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import {Splitpanes, Pane} from 'splitpanes'
+import { Splitpanes, Pane } from 'splitpanes'
 import 'splitpanes/dist/splitpanes.css'
 import {
   getConfigByName,
   getConfigByLogic,
   parseConfig, runLogic, getConfigByNameAsync,
 } from '@vue2-client/services/api/common'
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro.vue'
-import {executeStrFunctionByContext} from '@vue2-client/utils/runEvalFunction'
-import {getRealKeyData} from '@vue2-client/utils/util'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import { getRealKeyData } from '@vue2-client/utils/util'
 import * as util from '@vue2-client/utils/util'
 import UserInfoDetailManage from '@vue2-client/pages/userInfoDetailManage/index.vue'
 
@@ -238,7 +240,7 @@ export default {
     Splitpanes,
     Pane
   },
-  provide() {
+  provide () {
     return {
       getSelf: () => this,
       emitEvent: this.emitEvent.bind(this)
@@ -284,7 +286,7 @@ export default {
     currUser: {
       default: () => {
         console.warn('currUser is not provided.')
-        return {id: null, name: 'Guest'}
+        return { id: null, name: 'Guest' }
       },
     },
 
@@ -304,7 +306,7 @@ export default {
       }
     }
   },
-  data() {
+  data () {
     return {
       // 加载状态
       loading: false,
@@ -524,28 +526,33 @@ export default {
     hiddenFunctionalArea: {
       type: Boolean,
       default: false
-    }
+    },
+    // 默认查询的当页行数
+    defaultPageSize: {
+      type: Number,
+      default: 10
+    },
   },
   watch: {
     logicParam: {
-      handler() {
+      handler () {
         this.initConfig()
       },
       deep: true
     },
     queryParamsJson: {
-      handler() {
+      handler () {
         this.initConfig()
       },
       deep: true
     },
     queryParamsName: {
-      handler() {
+      handler () {
         this.initConfig()
       }
     },
     serviceName: {
-      handler() {
+      handler () {
         this.initConfig()
       }
     }
@@ -555,20 +562,20 @@ export default {
     getRealKeyData,
     getConfigByNameAsync,
     getConfigByName,
-    storePaneSize(treeSize) {
+    storePaneSize (treeSize) {
       localStorage.setItem('CURD::' + this.xTreeConfigName + '::TreeSize', treeSize[0].size)
     },
-    customEvent(func, data) {
+    customEvent (func, data) {
       this.$emit(func, data)
     },
-    columnClick(key, value, record) {
+    columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
-    gotoUserDetail(key, value, record) {
+    gotoUserDetail (key, value, record) {
       this.$refs.userInfo.init(getRealKeyData(record))
     },
     // 获取主表的数据内容，去掉主表别名
-    getPrimaryData(rows) {
+    getPrimaryData (rows) {
       const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
       const prefix = `${alias}_` // 构建前缀
       const result = []
@@ -589,7 +596,7 @@ export default {
     },
 
     // 给数据区域添加主表数据，给的数据没有主表别名，放着时添加主表别名
-    pushPrimaryData(rows) {
+    pushPrimaryData (rows) {
       const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
       const prefix = `${alias}_` // 构建前缀
       const result = rows.map(row => {
@@ -604,7 +611,7 @@ export default {
     },
 
     // 设置固定查询条件，主表别名自动带
-    setFixedQueryForm(data) {
+    setFixedQueryForm (data) {
       const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
       const prefixedData = {}
 
@@ -616,10 +623,10 @@ export default {
       Object.assign(this.fixedQueryForm, prefixedData)
     },
 
-    importExcelOk(data) {
+    importExcelOk (data) {
       this.$emit('importExcelOk', data)
     },
-    initConfig() {
+    initConfig () {
       this.loading = true
       this.loadError = false
       if (this.queryParamsName) {
@@ -634,7 +641,7 @@ export default {
       }
     },
 
-    getConfig() {
+    getConfig () {
       getConfigByName(this.queryParamsName, this.serviceName, (res) => {
         if (!res) {
           this.loading = false
@@ -644,7 +651,7 @@ export default {
         this.updateComponents(res)
       }, this.env === 'dev')
     },
-    getConfigBySource() {
+    getConfigBySource () {
       parseConfig(this.queryParamsJson, 'CRUD_FORM', this.serviceName, this.env === 'dev').then(res => {
         if (!res) {
           this.loading = false
@@ -654,7 +661,7 @@ export default {
         this.updateComponents(res, true)
       })
     },
-    getColumnJsonByLogic() {
+    getColumnJsonByLogic () {
       getConfigByLogic(this.logicName, this.logicParam, this.serviceName, (res) => {
         if (!res) {
           this.loading = false
@@ -670,7 +677,7 @@ export default {
      * @param res  参数
      * @param setQueryParams 是否设置queryParams参数
      */
-    updateComponents(res, setQueryParams) {
+    updateComponents (res, setQueryParams) {
       this.realQueryConfig = res
       // 读取表格展示模式配置
       this.tableShowMode = res.tableShowMode || 'default'
@@ -745,7 +752,7 @@ export default {
       this.loading = false
     },
     // 自定义按钮
-    editButtonStateDataClick(functionName, rows) {
+    editButtonStateDataClick (functionName, rows) {
       console.log('functionName', functionName)
       console.log('rows', rows)
       this.$emit(functionName, rows)
@@ -755,7 +762,7 @@ export default {
      * 提交查询表单事件
      * @param res  参数
      */
-    onSearchSubmit(res) {
+    onSearchSubmit (res) {
       if (res.valid) {
         // 如果是弹框模式，显示表单加载动画，不立即打开弹框
         if (this.tableShowMode === 'popup') {
@@ -775,11 +782,11 @@ export default {
     /**
      * 关闭表格弹框
      */
-    closeTableModal() {
+    closeTableModal () {
       this.tableModalVisible = false
     },
 
-    active(props) {
+    active (props) {
       let num = false
       for (const key in props) {
         // eslint-disable-next-line no-prototype-builtins
@@ -799,7 +806,7 @@ export default {
     /**
      * 提交新增/修改表单后事件
      */
-    onAddOrEditSubmitAfterSubmit(res) {
+    onAddOrEditSubmitAfterSubmit (res) {
       this.refreshTable(res.businessType === '新增')
       // commit
       this.$emit('afterSubmit', res)
@@ -809,7 +816,7 @@ export default {
      * @param res  参数（可能是 Promise）
      * @param conditionParams 查询条件
      */
-    async afterQuery(res, conditionParams) {
+    async afterQuery (res, conditionParams) {
       // 如果是弹框模式且正在查询中
       if (this.tableShowMode === 'popup' && this.formQueryLoading) {
         // 兼容 Promise
@@ -837,20 +844,20 @@ export default {
      * @param actionType 操作类型
      * @param fun 向上级传递的事件
      */
-    action(record, id, actionType, fun = 'action', index) {
+    action (record, id, actionType, fun = 'action', index) {
       this.$emit('innerXFormTableEmit', fun, record, id, actionType, index, this)
       this.$emit(fun, record, id, actionType, index, this)
     },
-    treeOnChecked(checkedKeys, deepNodes, deepKeys) {
+    treeOnChecked (checkedKeys, deepNodes, deepKeys) {
       this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
     },
-    treeBtnFuncClick(index, func) {
+    treeBtnFuncClick (index, func) {
       this.$emit('treeBtnFuncClick', index, func)
     },
     /**
      * 新增按钮事件
      */
-    add() {
+    add () {
       if (this.customAdd) {
         this.$emit('add')
       } else {
@@ -861,7 +868,7 @@ export default {
         }
       }
     },
-    addFormInit() {
+    addFormInit () {
       const res = this.realQueryConfig
       const localEditMode = !this.localEditMode ? res.localEditMode : this.localEditMode
       this.$refs.xAddForm.init({
@@ -886,7 +893,7 @@ export default {
     /**
      * 添加按钮事件
      */
-    move() {
+    move () {
       this.moveType = true
       this.$nextTick(
         () => {
@@ -901,7 +908,7 @@ export default {
      * 修改按钮事件
      * @param modifyModelData 修改表单数据
      */
-    edit(modifyModelData) {
+    edit (modifyModelData) {
       if (this.customEdit) {
         this.$emit('edit')
       } else {
@@ -929,7 +936,7 @@ export default {
     /**
      * 删除按钮事件
      */
-    del(keys, callback) {
+    del (keys, callback) {
       if (this.customDelete) {
         this.$emit('del', keys, callback)
       }
@@ -938,14 +945,14 @@ export default {
      * 删除后事件
      * @param res
      */
-    afterDelete(res) {
+    afterDelete (res) {
       this.$emit('afterDelete', res)
     },
     /**
      * 行选择事件
      * @param row 选中行
      */
-    rowChoose(row) {
+    rowChoose (row) {
       this.$emit('rowChoose', row)
     },
     /**
@@ -953,13 +960,13 @@ export default {
      * @param currRow 当前行
      * @param defaultAppendRowData 默认追加的行数据
      */
-    validateTableAndSyncData(currRow, defaultAppendRowData) {
+    validateTableAndSyncData (currRow, defaultAppendRowData) {
       this.$refs.xTable.validateTableAndSyncData(currRow, defaultAppendRowData)
     },
     /**
      * 更多条件是否展示
      */
-    toggleAdvanced() {
+    toggleAdvanced () {
       // 只有在非弹出模式下才需要调整表格滚动高度
       if (this.tableShowMode !== 'popup') {
         this.$refs.xTable.setScrollYHeight({})
@@ -968,7 +975,7 @@ export default {
     /**
      * 查询表单部分显示/隐藏切换
      */
-    toggleIsFormShow() {
+    toggleIsFormShow () {
       this.toggleIsFormIcon = this.toggleIsFormIcon === 'vertical-align-top' ? 'vertical-align-bottom' : 'vertical-align-top'
       this.$refs.xForm.toggleVisible()
       // 只有在非弹出模式下才需要调整表格滚动高度
@@ -981,7 +988,7 @@ export default {
      * @param selectedRowKeys 选中列Key集合
      * @param selectedRows 选中列
      */
-    selectRow(selectedRowKeys, selectedRows) {
+    selectRow (selectedRowKeys, selectedRows) {
       this.table_selectedRowKeys = selectedRowKeys
       this.table_selectedRows = selectedRows
       this.$emit('selectRow', selectedRowKeys, selectedRows)
@@ -989,14 +996,14 @@ export default {
     /**
      * 清除勾选数据
      */
-    clearRowKeys() {
+    clearRowKeys () {
       this.$refs.xTable.clearRowKeys()
     },
     /**
      * 刷新表格
      * @param toFirstPage 是否到第一页
      */
-    refreshTable(toFirstPage = true) {
+    refreshTable (toFirstPage = true) {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
@@ -1006,7 +1013,7 @@ export default {
      * 刷新表格
      * @param toFirstPage 是否到第一页
      */
-    refresh(toFirstPage = true) {
+    refresh (toFirstPage = true) {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
@@ -1015,7 +1022,7 @@ export default {
     /**
      * 主动传递条件查询表格
      */
-    queryTable(conditionParams) {
+    queryTable (conditionParams) {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
@@ -1024,30 +1031,30 @@ export default {
     /**
      * 向外暴露 resetForm 函数
      */
-    resetForm() {
+    resetForm () {
       this.$refs.xForm.resetForm()
     },
     /**
      * 获取表格数据
      */
-    getTableData() {
+    getTableData () {
       return this.$refs.xTable.getTableData()
     },
     // 在行编辑等情况下，让界面生效
-    update() {
+    update () {
       this.getTableData().push(...[])
     },
 
     /**
      * 设置表格数据
      */
-    setTableData(data) {
+    setTableData (data) {
       this.$refs.xTable.setTableData(data)
     },
     /**
      * 表单本地提交
      */
-    onLocalSubmit(res, callback) {
+    onLocalSubmit (res, callback) {
       const form = res.realForm
       if (res.businessType === '新增') {
         this.$refs.xTable.appendLocalData(form)
@@ -1060,25 +1067,25 @@ export default {
         callback()
       }
     },
-    emitFunc(func, ...args) {
+    emitFunc (func, ...args) {
       this.$emit(func, ...args)
       this.$emit('getEmitFuncData', func, ...args)
     },
     // 直接转发事件的函数
-    emitEvent(event, ...args) {
+    emitEvent (event, ...args) {
       this.$emit(event, ...args)
     },
     // 添加处理 rowClick 的方法
-    handleRowClick(record) {
+    handleRowClick (record) {
       this.$emit('rowClick', record)
     },
-    handleRowDblClick(record) {
+    handleRowDblClick (record) {
       this.$emit('rowDblClick', record)
     },
-    beforeDataChange(record) {
+    beforeDataChange (record) {
       this.$emit('beforeDataChange', record)
     },
-    onExpand(expanded, record) {
+    onExpand (expanded, record) {
       this.$emit('expand', expanded, record)
     }
   },
@@ -1086,7 +1093,7 @@ export default {
     /**
      * 实现doAction方法
      */
-    doAction(actionType, args, data) {
+    doAction (actionType, args, data) {
       switch (actionType) {
         case 'refreshTable':
           for (const item in args) {
@@ -1098,7 +1105,7 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     if (!this.isMounted) {
       // 防止多次调用
       // 不知道为啥他会执行两次 mounted 暂时处理方式
@@ -1119,8 +1126,8 @@ export default {
         Object.assign(this.fixedAddForm, data)
         Object.assign(this.fixedQueryForm, data)
       } else {
-        Object.assign(this.fixedAddForm, {selected_id: selectedId})
-        Object.assign(this.fixedQueryForm, {selected_id: selectedId})
+        Object.assign(this.fixedAddForm, { selected_id: selectedId })
+        Object.assign(this.fixedQueryForm, { selected_id: selectedId })
       }
     }
   }