agilebuilder-ui 1.0.621 → 1.0.962

package/packages/super-grid/src/super-grid.vue

@@ -1,12 +1,8 @@
 <template>
-  <div>
+  <div :style="subTableStyle">
     <search-form
-      v-if="
-        !isFormSubTable &&
-        hasLoadedColumns &&
-        query &&
-        query.showType === 'embedded'
-      "
+      v-if="!isFormSubTable && hasLoadedColumns && query && query.showType === 'embedded'"
+      v-show="!isMobile || (isMobile && isShowMobileSearch)"
       ref="sf"
       :columns="columns"
       :code="code"
@@ -21,6 +17,8 @@
       @search="doSearch"
       @reset="resetSearch"
       @open-fold="openFold"
+      @can-show-mobile-search="$emit('can-show-mobile-search', code)"
+      @close-mobile-search="isShowMobileSearch = false"
     />
     <search-form-dialog
       v-if="hasLoadedColumns && query && query.showType === 'popup'"
@@ -72,6 +70,7 @@
         @cell-click="selectCell"
         @cell-dblclick="cellDblClick"
       >
+        <row-detail v-if="detailColumn" :column="detailColumn" :list-code="code" @show-detail="openRowForm" />
         <template v-if="myCustomFormatter">
           <component
             :is="getComponentType(column)"
@@ -82,9 +81,7 @@
             :is-sql="isSql"
             :list-code="code"
             :custom-format="
-              getComponentType(column) === 'GroupColumn'
-                ? myCustomFormatter
-                : myCustomFormatter[column.prop]
+              getComponentType(column) === 'GroupColumn' ? myCustomFormatter : myCustomFormatter[column.prop]
             "
             :new-width="newWidth"
             :drag-column-prop="dragColumnProp"
@@ -96,9 +93,8 @@
             :pagination="pagination"
             :current-page="currentPage"
             :grid-data="isSubTableShowPage ? subTableData : gridData"
-            :page-grid-data="
-              isSubTableShowPage ? getSubTableGridData(subTableData) : gridData
-            "
+            :page-grid-data="isSubTableShowPage ? getSubTableGridData(subTableData) : gridData"
+            @refresh-list="refreshList"
             @open-page="openPageDialog"
             @refresPortData="refresPortData"
             @refresPortsData="refresPortsData"
@@ -127,11 +123,10 @@
             :current-page="currentPage"
             :pagination="pagination"
             :grid-data="isSubTableShowPage ? subTableData : gridData"
-            :page-grid-data="
-              isSubTableShowPage ? getSubTableGridData(subTableData) : gridData
-            "
+            :page-grid-data="isSubTableShowPage ? getSubTableGridData(subTableData) : gridData"
             @open-page="openPageDialog"
             @refresData="refresData"
+            @refresh-list="refreshList"
             @refresPortData="refresPortData"
             @refresPortsData="refresPortsData"
             @refresMainTableFields="refresMainTableFields"
@@ -151,10 +146,20 @@
                   "
                   :span="2"
                 > -->
-          <el-icon v-if="basicInfo.customConfig && !isFormSubTable" class="el-icon-setting" :title="$t('superGrid.columnConfig')" @click="configColumns" style="float: left; padding: 10px 0px; color: #777"
+          <el-icon
+            v-if="basicInfo.customConfig && !isFormSubTable"
+            class="el-icon-setting"
+            :title="$t('superGrid.columnConfig')"
+            @click="configColumns"
+            style="float: left; padding: 10px 0px; color: #777"
             ><el-icon-setting
           /></el-icon>
-          <el-icon v-if="!isFormSubTable" class="el-icon-refresh" :title="$t('superGrid.refresh')" @click="refreshGridData" style="float: left; padding: 10px 0px; color: #777"
+          <el-icon
+            v-if="!isFormSubTable"
+            class="el-icon-refresh"
+            :title="$t('superGrid.refresh')"
+            @click="refreshGridData"
+            style="float: left; padding: 10px 0px; color: #777"
             ><el-icon-refresh
           /></el-icon>
           <!-- </el-col> -->
@@ -176,7 +181,13 @@
               background
               :page-sizes="pagination.pageSizes"
               :layout="pagination.layout"
-              :total="pagination.showTotal?(pagination.total!==undefined&&pagination.total!==''&&pagination.total!==null?pagination.total:0):100000000000"
+              :total="
+                pagination.showTotal
+                  ? pagination.total !== undefined && pagination.total !== '' && pagination.total !== null
+                    ? pagination.total
+                    : 0
+                  : 100000000000
+              "
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
             />
@@ -200,20 +211,38 @@
       :column="rightClickColumn"
       @clearHeaderContextmenu="clearHeaderContextmenu"
     />
-    <!-- <super-page-dialog
-      v-if="isShowPageDialog"
-      :dev-mode="pageDevMode"
-      :jump-page-setting="jumpPageSetting"
-      :source-page-code="pageCode"
-      @close="closePageDialog"
-      @update-value="updateValues"
-    /> -->
+    <row-form
+      v-if="showRowForm"
+      :parent-form-data="parentFormData"
+      :columns="visibleColumns"
+      :row-index="currentEditRowIndex"
+      :list-code="code"
+      :drag-column-prop="dragColumnProp"
+      :is-sql="isSql"
+      :base-url="baseURL"
+      :options="options"
+      :table-name="tableName"
+      :page-code="pageCode"
+      :list-toolbar-form-data="listToolbarFormData"
+      :list-name="listName"
+      :current-page="currentPage"
+      :grid-data="isSubTableShowPage ? subTableData : gridData"
+      :page-grid-data="isSubTableShowPage ? getSubTableGridData(subTableData) : gridData"
+      :line-edit="lineEdit"
+      @close="closeRowForm"
+      @refresData="refresData"
+      @refresPortData="refresPortData"
+      @refresPortsData="refresPortsData"
+      @refresMainTableFields="refresMainTableFields"
+      @open-page="openPageDialog"
+      @prohibitToEdit="prohibitToEdit"
+    />
   </div>
 </template>
 
 <script>
-import {Refresh as ElIconRefresh, Setting as ElIconSetting,} from '@element-plus/icons-vue'
-import {$emit} from '../../utils/gogocodeTransfer'
+import { Refresh as ElIconRefresh, Setting as ElIconSetting } from '@element-plus/icons-vue'
+import { $emit } from '../../utils/gogocodeTransfer'
 import IndexColumn from './index-column.vue'
 import SelectionColumn from './selection-column.vue'
 import NormalColumn from './normal-column.vue'
@@ -221,21 +250,23 @@ import GroupColumn from './group-column.vue'
 import ColumnsConfig from './columns-config.vue'
 import SearchForm from './search-form.vue'
 import searchFormDialog from './search-form-dialog.vue'
-import {getEntityFieldValueWithOutCase, setEntityFieldValue} from '../../../src/utils/util'
+import RowDetail from './row-detail.vue'
+import { getEntityFieldValueWithOutCase, setEntityFieldValue } from '../../../src/utils/util'
 import eventBus from './eventBus'
 import {
-	addDynamicProp,
-	getExtraParam,
-	getFirstEditableColumn,
-	getGridParams,
-	getLastPageNum,
-	getSpanValuesForColumn,
-	getTableHeight,
-	isCanRefreshGrid,
-	isEditOptionFunction,
-	isHasEditOption,
-	isHasOptionFunction,
-	isObjectValueEqual,
+  addDynamicProp,
+  getControlConfig,
+  getExtraParam,
+  getFirstEditableColumn,
+  getGridParams,
+  getLastPageNum,
+  getSpanValuesForColumn,
+  getTableHeight,
+  isCanRefreshGrid,
+  isEditOptionFunction,
+  isHasEditOption,
+  isHasOptionFunction,
+  isObjectValueEqual
 } from './utils'
 import Sortable from 'sortablejs'
 import store from './store'
@@ -243,11 +274,11 @@ import events from './events'
 import publicMethods from './public-methods'
 import superGridService from './super-grid-service'
 import formValidatorService from './formValidatorUtil'
-import {getSystemCode} from '../../../src/utils/permissionAuth'
+import { getSystemCode } from '../../../src/utils/permissionAuth'
 import apis from './apis'
 import headerContextMenu from './header-context-menu.vue'
-import {isPromise} from '../../../src/utils/common-util'
-import {checkPermission} from '../../../src/utils/permission'
+import { isMobileBrowser, isPromise } from '../../../src/utils/common-util'
+import { checkPermission } from '../../../src/utils/permission'
 
 export default {
   components: {
@@ -261,50 +292,51 @@ export default {
     searchFormDialog,
     ElIconSetting,
     ElIconRefresh,
+    RowDetail
   },
   name: 'SuperGrid',
   props: {
     code: {
       type: String,
-      default: '',
-    },
-	  url: {
-		  type: String,
-		  default: '',
-	  },
-	  options: {
-		  type: Object,
-		  default: function () {
-			  return {}
-		  },
-	  },
-	  publishVersion: {
-		  type: Number,
-		  default: 0
-	  },
-	  // 为了兼容平台的旧写法，暂不删除以下属性
-	  // 操作列、占位符列内容显示的函数，格式为：{'属性名':方法},例如：{'name':viewUser,'operation':showOperation}
-	  customFormatter: {
-		  type: Object,
-		  default: null,
-	  },
-	  searchFormInfo: {
-		  type: Object,
-		  default: () => {
-			  return {}
-      },
+      default: ''
+    },
+    url: {
+      type: String,
+      default: ''
+    },
+    options: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    publishVersion: {
+      type: Number,
+      default: 0
+    },
+    // 为了兼容平台的旧写法，暂不删除以下属性
+    // 操作列、占位符列内容显示的函数，格式为：{'属性名':方法},例如：{'name':viewUser,'operation':showOperation}
+    customFormatter: {
+      type: Object,
+      default: null
+    },
+    searchFormInfo: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     },
     // 是否显示分页器
     showPagination: {
       type: Boolean,
-      default: true,
+      default: true
     },
     listToolbarFormData: {
       type: Object,
-      default: null,
+      default: null
     },
     // 列表配置信息，如果该属性有值，则不再根据listCode获得列表及字段配置
-    settings:{
+    settings: {
       type: Object,
       default: null
     },
@@ -316,27 +348,15 @@ export default {
   data() {
     let parentProp
     const parentPropSetting = this.options.parentProp
-    if (
-      typeof parentPropSetting !== 'undefined' &&
-      parentPropSetting !== '' &&
-      parentPropSetting !== null
-    ) {
+    if (typeof parentPropSetting !== 'undefined' && parentPropSetting !== '' && parentPropSetting !== null) {
       parentProp = parentPropSetting
     }
     let mergeFields = []
-    if (
-      this.options &&
-      this.options.mergeFields &&
-      this.options.mergeFields !== ''
-    ) {
+    if (this.options && this.options.mergeFields && this.options.mergeFields !== '') {
       mergeFields = this.options.mergeFields.split(',')
     }
     let optionTableHeight
-    if (
-      this.options &&
-      this.options.optionTableHeight &&
-      this.options.optionTableHeight !== ''
-    ) {
+    if (this.options && this.options.optionTableHeight && this.options.optionTableHeight !== '') {
       optionTableHeight = this.options.optionTableHeight
     }
     let pageCode
@@ -358,43 +378,43 @@ export default {
     // 数据库类型，值为mysql、oracle、sqlserver，默认是mysql，树形表格时需要使用
     let dataSourceType = 'mysql'
     if (window.$vueApp.config.globalProperties.dataSourceType) {
-      dataSourceType =
-        window.$vueApp.config.globalProperties.dataSourceType.toLowerCase()
+      dataSourceType = window.$vueApp.config.globalProperties.dataSourceType.toLowerCase()
     }
     let pageDevMode = this.options.pageDevMode
     if (pageDevMode === undefined) {
       pageDevMode = false
     }
     let tableStyle
-    if(this.options && this.options.tableStyle){
+    if (this.options && this.options.tableStyle) {
       tableStyle = this.options.tableStyle
     }
-    if(!tableStyle){
+    if (!tableStyle) {
       tableStyle = {}
     }
     tableStyle.width = '100%'
     let tableClass
-    if(this.options && this.options.tableClass){
+    if (this.options && this.options.tableClass) {
       tableClass = this.options.tableClass
     }
-    if(!tableClass){
+    if (!tableClass) {
       tableClass = ''
     }
     tableClass += ' elTable'
     let configureObj
-    if(this.options && this.options.configureObj){
+    if (this.options && this.options.configureObj) {
       configureObj = this.options.configureObj
     }
     let pageContext
-    if(this.options && this.options.pageContext){
+    if (this.options && this.options.pageContext) {
       pageContext = this.options.pageContext
     }
+    const isMobile = isMobileBrowser()
     return {
       isLoading: false,
       currentPage: 1,
       showColumnConfig: false,
       basicInfo: {
-        summary: 'no',
+        summary: 'no'
       },
       columns: [],
       loadCompleteQuery: false,
@@ -452,7 +472,14 @@ export default {
       tableStyle, // 表格的style
       tableClass, // 表格的class
       pageContext, // 页面配置上下文
-      configureObj // 表格配置信息
+      configureObj, // 表格配置信息
+      isMobile, // 是否是移动端
+      isShowMobileSearch: false, // 是否显示移动端查询区域
+      subTableStyle: {},
+      detailColumn: null, // 详情列。子表展开表单 配置使用。
+      currentEditRowIndex: null, // 当前查看的行记录号
+      showRowForm: false, // 是否显示行记录详情
+      baseURL: null
     }
   },
   computed: {
@@ -460,11 +487,7 @@ export default {
       const gridParams = store.get(this.code)
       const operations = this.getOptionOperations()
       gridParams.canntEdit = false
-      if (
-        operations &&
-        operations.operation &&
-        operations.operation.length > 0
-      ) {
+      if (operations && operations.operation && operations.operation.length > 0) {
         operations.operation.forEach((buttonInfo) => {
           if (buttonInfo.props.code === 'lineEditUpdate') {
             if (checkPermission(buttonInfo.props.functionCode)) {
@@ -501,11 +524,7 @@ export default {
           if (column.show === undefined || column.show) {
             isVisible = true
             const hiddenColumns = this.options.hiddenColumns
-            if (
-              hiddenColumns &&
-              hiddenColumns.length > 0 &&
-              hiddenColumns.indexOf(column.prop) !== -1
-            ) {
+            if (hiddenColumns && hiddenColumns.length > 0 && column.prop && hiddenColumns.indexOf(column.prop) !== -1) {
               // 如果当前字段包含在隐藏字段集合中，则不显示该字段
               isVisible = false
               return isVisible
@@ -529,23 +548,14 @@ export default {
     spanArr() {
       const spanArr = []
       for (const column of this.columns) {
-        if (
-          column.span ||
-          (this.mergeFields && this.mergeFields.indexOf(column.prop) !== -1)
-        ) {
-          spanArr[column.prop] = getSpanValuesForColumn(
-            this.gridData,
-            column.prop,
-            column.mergerCellBasis
-          )
+        if (column.span || (this.mergeFields && this.mergeFields.indexOf(column.prop) !== -1)) {
+          spanArr[column.prop] = getSpanValuesForColumn(this.gridData, column.prop, column.mergerCellBasis)
         }
       }
       return spanArr
     },
     showSummary() {
-      return (
-        this.basicInfo.summary !== undefined && this.basicInfo.summary !== 'no'
-      )
+      return this.basicInfo.summary !== undefined && this.basicInfo.summary !== 'no'
     },
     // 返回table用来确定唯一的字段。必须配置，否则树形结构时无法显示子集合。
     getRowKeyProp() {
@@ -559,7 +569,7 @@ export default {
           return 'id'
         }
       }
-    },
+    }
     // ,
     // hasLoadMainTable() {
     //   const hasLoadMainTable = store.get('hasLoadMainTable')
@@ -577,7 +587,7 @@ export default {
         console.log('监听到数据改变')
         this.initSetting()
         this.initialize()
-      },
+      }
     },
     // 监控列表数据修改，列表作为表单编辑器中子表时使用
     gridData: {
@@ -588,7 +598,7 @@ export default {
           // 列表子表不分页时使用
           $emit(this, 'change-grid-data', this.gridData)
         }
-      },
+      }
     },
     // 监控列表数据修改，列表作为表单编辑器中子表时使用
     subTableData: {
@@ -599,16 +609,10 @@ export default {
           // 列表子表分页时使用
           const gridParams = store.get(this.code)
           $emit(this, 'change-grid-data', this.subTableData)
-          if (
-            gridParams.isChangePage !== undefined &&
-            gridParams.isChangePage
-          ) {
+          if (gridParams.isChangePage !== undefined && gridParams.isChangePage) {
             // 表示新建记录时
             // 新建记录时跳转到最后一页
-            const lastPageNum = getLastPageNum(
-              this.subTableData.length,
-              this.pageSize
-            )
+            const lastPageNum = getLastPageNum(this.subTableData.length, this.pageSize)
             // 表示最后一页页码和当前页不同时需要切换页码
             if (lastPageNum !== this.currentPage) {
               // 切换当前页码为最后一页
@@ -619,9 +623,7 @@ export default {
               // 表示不需要切换页码
               this.gridData = this.getSubTableGridData(this.subTableData)
               gridParams.gridData = this.gridData // 完成深拷贝，复制一份对象，行编辑时使用
-              gridParams.orgGridData = [].concat(
-                JSON.parse(JSON.stringify(this.gridData))
-              )
+              gridParams.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)))
             }
             if (gridParams.lineEdit.editingCell) {
               gridParams.lineEdit.editingCell.row = this.gridData.length
@@ -633,12 +635,10 @@ export default {
             this.gridData = this.getSubTableGridData(this.subTableData)
             gridParams.gridData = this.gridData
             // 完成深拷贝，复制一份对象，行编辑时使用
-            gridParams.orgGridData = [].concat(
-              JSON.parse(JSON.stringify(this.gridData))
-            )
+            gridParams.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)))
           }
         }
-      },
+      }
     },
     currentSelectCell: {
       deep: true,
@@ -653,16 +653,13 @@ export default {
             oldVal.style.border = ''
           }
         })
-      },
+      }
     },
     'options.validateRules': {
       deep: true,
       handler: function () {
         this.externalClickFlag = true
-        console.log(
-          '监听到数据改变================',
-          this.options.validateRules
-        )
+        console.log('监听到数据改变================', this.options.validateRules)
         const gridParams = store.get(this.code)
         if (gridParams && gridParams.options) {
           gridParams.options.validateRules = this.options.validateRules
@@ -670,7 +667,7 @@ export default {
         }
         // this.initSetting()
         // this.initialize()
-      },
+      }
     },
     'options.subTableCanAdd': {
       deep: true,
@@ -680,7 +677,7 @@ export default {
           gridParams.options.subTableCanAdd = this.options.subTableCanAdd
           store.set(this.code, gridParams)
         }
-      },
+      }
     },
     // pageSize每页显示多少条，改变时抛出事件，配置出来的流程表单子表验证提示信息时使用，例如：“第x页第x条记录，xxx必填”，获得页数时需要使用
     pageSize: {
@@ -688,7 +685,7 @@ export default {
 
       handler(newValue, oldValue) {
         $emit(this, 'change-rows-per-page', this.pageSize)
-      },
+      }
     },
     // 更新parent值
     'options.extraParam.entityMap': {
@@ -714,7 +711,9 @@ export default {
       stripe = false
     }
     this.stripe = stripe
-
+    if (isHasOptionFunction('filter-method', this.code)) {
+      debugger
+    }
     // if (this.parentProp) {
     //   // 表示配置了树形配置
     //   this.treeProps = this.getTreeProps()
@@ -724,11 +723,7 @@ export default {
   mounted() {
     this.initialize().then(() => {
       const gridParams = store.get(this.code)
-      if (
-        gridParams &&
-        gridParams.basicInfo &&
-        gridParams.basicInfo.tableName
-      ) {
+      if (gridParams && gridParams.basicInfo && gridParams.basicInfo.tableName) {
         this.tableName = gridParams.basicInfo.tableName
       }
       if (gridParams && gridParams.basicInfo && gridParams.basicInfo.name) {
@@ -740,7 +735,7 @@ export default {
           if (column.valueSet) {
             $emit(this, 'set-select-options', {
               prop: this.code + '.' + column.prop,
-              valueSet: column.valueSet,
+              valueSet: column.valueSet
             })
           }
         })
@@ -758,7 +753,7 @@ export default {
             },
             {
               immediate: true,
-              deep: true,
+              deep: true
             }
           )
         }
@@ -771,39 +766,43 @@ export default {
                 const gridParams = store.get(this.code)
                 if (isHasOptionFunction('gridComplete', this.code)) {
                   gridParams.options.gridComplete.call(this, {
-                    gridData: this.isSubTableShowPage
-                      ? this.subTableData
-                      : this.gridData,
+                    gridData: this.isSubTableShowPage ? this.subTableData : this.gridData,
                     columns: gridParams.columns,
                     superGrid: this.$refs.superGrid,
-                    pageGridData: this.isSubTableShowPage
-                      ? this.gridData
-                      : null,
+                    pageGridData: this.isSubTableShowPage ? this.gridData : null,
+                    listCode: this.code,
                     additionalParamMap: gridParams.additionalParamMap,
                     pageContext: this.pageContext,
                     configureObj: this.configureObj
                   })
                 }
+                this.$emit('gridComplete', {
+                  gridData: this.isSubTableShowPage ? this.subTableData : this.gridData,
+                  columns: gridParams.columns,
+                  superGrid: this.$refs.superGrid,
+                  isMobile: false,
+                  listCode: this.code,
+                  pageGridData: this.isSubTableShowPage ? this.gridData : null,
+                  additionalParamMap: gridParams.additionalParamMap
+                })
               })
             }
           },
           {
             immediate: true,
-            deep: true,
+            deep: true
           }
         )
 
         const that = this
-        const isShowUserTreeDialog =
-          document.querySelector('.user-tree') !== null
+        const isShowUserTreeDialog = document.querySelector('.user-tree') !== null
         // 当前页面监视键盘输入
         document.querySelector('.' + this.code).onkeydown = function (e) {
           if (!that.isShowPageDialog && !isShowUserTreeDialog) {
             // 当前列表页面没有弹框或选人弹框，才走键盘监视事件
             // 事件对象兼容
             // eslint-disable-next-line no-caller
-            const e1 =
-              e || event || window.event || arguments.callee.caller.arguments[0]
+            const e1 = e || event || window.event || arguments.callee.caller.arguments[0]
             // 处于行编辑状态时，左右上下箭头事件不需要生效
             const isEdit = that.isEditRow(that)
             // 键盘按键判断:左箭头-37;上箭头-38；右箭头-39;下箭头-40
@@ -852,7 +851,7 @@ export default {
           gridParams.options.extraParam = newValue
         },
         {
-          deep: true,
+          deep: true
         }
       )
     })
@@ -868,18 +867,10 @@ export default {
     // 是否触发回车事件
     isCallEnterEvent(that) {
       let canCall = true
-      if (
-        that.options.isEnableEnterEvent !== undefined &&
-        that.options.isEnableEnterEvent === false
-      ) {
+      if (that.options.isEnableEnterEvent !== undefined && that.options.isEnableEnterEvent === false) {
         canCall = false
       }
-      console.log(
-        'super-grid-----isEnableEnterEvent=',
-        that.options.isEnableEnterEvent,
-        'canCall=',
-        canCall
-      )
+      console.log('super-grid-----isEnableEnterEvent=', that.options.isEnableEnterEvent, 'canCall=', canCall)
       const gridParams = store.get(that.code)
       if (canCall && gridParams.options && gridParams.options.isFormSubTable) {
         canCall = false
@@ -888,27 +879,20 @@ export default {
     },
     isShowPageArea() {
       if (this.isFormSubTable) {
-        return (
-          this.options.showPageArea !== undefined &&
-          this.options.showPageArea === true
-        )
+        return this.options.showPageArea !== undefined && this.options.showPageArea === true
       } else {
         return true
       }
     },
     resizeTableHeight() {
       this.$nextTick(() => {
-        let tableHeight = getTableHeight(
-          this.$refs.superGrid,
-          this.code,
-          this.pageHeight
-        )
-        
+        let tableHeight = getTableHeight(this.$refs.superGrid, this.code, this.pageHeight)
+
         let tempMaxHeight = null
         const gridParams = store.get(this.code)
         if (isHasOptionFunction('resizeHeight', this.code)) {
           let searchHeight = 0
-          if (this.$refs.sf) {
+          if (this.$refs.sf && !this.isMobile) {
             // 获得查询区高度
             searchHeight = this.$refs.sf.$el.offsetHeight
           }
@@ -925,54 +909,55 @@ export default {
           }
         }
         // 设置列表最大高度
-        if (
-          gridParams.options &&
-          gridParams.options.isFormSubTable &&
-          gridParams.options.isPdfEditor
-        ) {
+        if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.isPdfEditor) {
           tempMaxHeight = null
-        } else if (
-          gridParams.options &&
-          gridParams.options.isFormSubTable &&
-          gridParams.options.formSetMaxHeight
-        ) {
+        } else if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.formSetMaxHeight) {
           tempMaxHeight = gridParams.options.formSetMaxHeight
         }
-       
 
         // 设置列表高度
-        if(tempMaxHeight === undefined || tempMaxHeight === null) {
+        if (tempMaxHeight === undefined || tempMaxHeight === null) {
           tempMaxHeight = tableHeight
           if (this.optionTableHeight) {
             tempMaxHeight = this.optionTableHeight
-          } else if (
-            gridParams.options &&
-            gridParams.options.isFormSubTable &&
-            gridParams.options.isPdfEditor
-          ) {
+          } else if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.isPdfEditor) {
             tempMaxHeight = null
-          } else if (
-            gridParams.options &&
-            gridParams.options.isFormSubTable &&
-            gridParams.options.formSetHeight
-          ) {
+          } else if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.formSetHeight) {
             tempMaxHeight = gridParams.options.formSetHeight
-          } else if (
-            !this.basicInfo.displayEffect ||
-            this.basicInfo.displayEffect === '' ||
-            this.basicInfo.displayEffect === 'default'
-          ) {
-            tempMaxHeight = null
           }
+          //  else if (
+          //   !this.basicInfo.displayEffect ||
+          //   this.basicInfo.displayEffect === '' ||
+          //   this.basicInfo.displayEffect === 'default'
+          // ) {
+          //   tempMaxHeight = null
+          // }
           // if(tempHeight !== undefined && tempHeight !== null){
           //   // el-table的height和maxHeight不能同时设值，会导致列表渲染失败，报脚本错.设置height不起作用,都使用maxHeight控制列表高度吧,暂时不知道原因
-            // this.tableHeight = tempHeight
+          // this.tableHeight = tempHeight
           // }
         }
-         if(tempMaxHeight !== undefined && tempMaxHeight !== null){
+        if (
+          !this.basicInfo.displayEffect ||
+          this.basicInfo.displayEffect === '' ||
+          this.basicInfo.displayEffect === 'default'
+        ) {
+          // default默认不铺满
           this.maxHeight = tempMaxHeight
+        } else {
+          // 表示需要cover铺满
+          this.tableHeight = tempMaxHeight
         }
-        console.log('resizeTableHeight-----tempMaxHeight=',tempMaxHeight,'this.tableHeight=',this.tableHeight,'this.maxHeight=', this.maxHeight ,'gridParams.options=', gridParams.options)
+        console.log(
+          'resizeTableHeight-----tempMaxHeight=',
+          tempMaxHeight,
+          'this.tableHeight=',
+          this.tableHeight,
+          'this.maxHeight=',
+          this.maxHeight,
+          'gridParams.options=',
+          gridParams.options
+        )
       })
     },
     // 回车键
@@ -1000,14 +985,13 @@ export default {
           if (rowIndex !== undefined && rowIndex !== null) {
             const row = gridParams.gridData[rowIndex]
             if (isEditOptionFunction('enter', that.listCode)) {
-              if(this.pageContext){
-                gridParams.options.lineEditOptions.enter.call(
-                  that,{
+              if (this.pageContext) {
+                gridParams.options.lineEditOptions.enter.call(that, {
                   rowIndex,
-                  column:that.column,
+                  column: that.column,
                   row,
-                  orgRow:gridParams.orgGridData[rowIndex],
-                  additionalParamMap:gridParams.additionalParamMap,
+                  orgRow: gridParams.orgGridData[rowIndex],
+                  additionalParamMap: gridParams.additionalParamMap,
                   pageContext: gridParams.pageContext,
                   configureObj: gridParams.configureObj
                 })
@@ -1038,19 +1022,17 @@ export default {
           that.restoreRow(rowIndex, that.code)
           const row = gridParams.gridData[rowIndex]
           if (isEditOptionFunction('esc', that.listCode)) {
-            if(this.pageContext){
-              gridParams.options.lineEditOptions.esc.call(
-                that,{
-                  rowIndex,
-                  column:that.column,
-                  row,
-                  row:gridParams.orgGridData[rowIndex],
-                  additionalParamMap:gridParams.additionalParamMap,
-                  pageContext: gridParams.pageContext,
-                  configureObj: gridParams.configureObj
-                }
-              )
-            }else {
+            if (this.pageContext) {
+              gridParams.options.lineEditOptions.esc.call(that, {
+                rowIndex,
+                column: that.column,
+                row,
+                row: gridParams.orgGridData[rowIndex],
+                additionalParamMap: gridParams.additionalParamMap,
+                pageContext: gridParams.pageContext,
+                configureObj: gridParams.configureObj
+              })
+            } else {
               gridParams.options.lineEditOptions.esc.call(
                 that,
                 rowIndex,
@@ -1060,7 +1042,6 @@ export default {
                 gridParams.additionalParamMap
               )
             }
-
           } else {
             that.restoreRow(rowIndex, that.code)
           }
@@ -1177,10 +1158,7 @@ export default {
               const classObj = tableDiv.attributes['class']
               if (classObj) {
                 const tableDivClasses = classObj['nodeValue']
-                if (
-                  tableDivClasses &&
-                  tableDivClasses.indexOf('el-table__fixed-body-wrapper') >= 0
-                ) {
+                if (tableDivClasses && tableDivClasses.indexOf('el-table__fixed-body-wrapper') >= 0) {
                   // 表示当前单元格是冻结列中的，需要在非冻结列中获得该单元格
                   let tdClass = null
                   if (classes && classes.indexOf(' ') > 0) {
@@ -1189,17 +1167,11 @@ export default {
                   }
                   if (tdClass) {
                     const targetCell = document.querySelector(
-                      '.' +
-                        this.code +
-                        ' .el-table__body-wrapper .current-row .' +
-                        tdClass
+                      '.' + this.code + ' .el-table__body-wrapper .current-row .' + tdClass
                     )
                     that.currentSelectCell = targetCell
                   }
-                } else if (
-                  tableDivClasses &&
-                  tableDivClasses.indexOf('el-table__body-wrapper') >= 0
-                ) {
+                } else if (tableDivClasses && tableDivClasses.indexOf('el-table__body-wrapper') >= 0) {
                   // 表示当前单元格是非冻结列中的，需要在冻结列中获得该单元格
                   let tdClass = null
                   if (classes && classes.indexOf(' ') > 0) {
@@ -1208,10 +1180,7 @@ export default {
                   }
                   if (tdClass) {
                     const targetCell = document.querySelector(
-                      '.' +
-                        this.code +
-                        ' .el-table__fixed-body-wrapper .current-row  .' +
-                        tdClass
+                      '.' + this.code + ' .el-table__fixed-body-wrapper .current-row  .' + tdClass
                     )
                     that.currentSelectCell = targetCell
                   }
@@ -1224,15 +1193,8 @@ export default {
     },
     // 存储有默认值的字段集合
     storeHasDefaultValueColumns(column, gridParams) {
-      if (
-        column.defaultValue !== undefined &&
-        column.defaultValue !== null &&
-        column.defaultValue !== ''
-      ) {
-        if (
-          gridParams.defaultValueColumns === undefined ||
-          gridParams.defaultValueColumns === null
-        ) {
+      if (column.defaultValue !== undefined && column.defaultValue !== null && column.defaultValue !== '') {
+        if (gridParams.defaultValueColumns === undefined || gridParams.defaultValueColumns === null) {
           gridParams.defaultValueColumns = []
         }
         gridParams.defaultValueColumns.push(column)
@@ -1250,6 +1212,7 @@ export default {
         gridParams.options.isFormSubTable === true
       ) {
         this.isFormSubTable = true
+        this.subTableStyle = { width: '100%' }
       }
     },
     /**
@@ -1264,10 +1227,7 @@ export default {
     },
     // 获得属性列操作信息
     getOptionOperations() {
-      if (
-        typeof this.options['operations'] !== 'undefined' &&
-        this.options['operations'] !== null
-      ) {
+      if (typeof this.options['operations'] !== 'undefined' && this.options['operations'] !== null) {
         return this.options['operations']
       }
     },
@@ -1278,10 +1238,7 @@ export default {
         if (!gridParams.options.lineEditOptions) {
           gridParams.options.lineEditOptions = gridParams.defaultLineEditOptions
         }
-        if (
-          typeof this.options['customFormatter'] !== 'undefined' &&
-          this.options['customFormatter'] !== null
-        ) {
+        if (typeof this.options['customFormatter'] !== 'undefined' && this.options['customFormatter'] !== null) {
           this.myCustomFormatter = this.options['customFormatter']
         }
       } else {
@@ -1289,50 +1246,37 @@ export default {
         gridParams.options.lineEditOptions = gridParams.defaultLineEditOptions
       }
       if (!isHasEditOption('input', this.code)) {
-        gridParams.options.lineEditOptions.input =
-          gridParams.defaultLineEditOptions.input
+        gridParams.options.lineEditOptions.input = gridParams.defaultLineEditOptions.input
       }
-      if (
-        !this.myCustomFormatter &&
-        typeof this.customFormatter !== 'undefined' &&
-        this.customFormatter !== null
-      ) {
+      if (!this.myCustomFormatter && typeof this.customFormatter !== 'undefined' && this.customFormatter !== null) {
         this.myCustomFormatter = this.customFormatter
       }
-      if (
-        this.options &&
-        this.options.dynamicServiceName &&
-        this.options.dynamicServiceName !== undefined
-      ) {
+      if (this.options && this.options.dynamicServiceName && this.options.dynamicServiceName !== undefined) {
         this.dynamicServiceName = this.options.dynamicServiceName
         gridParams.dynamicServiceName = this.dynamicServiceName
       }
-      if (
-        this.options &&
-        this.options.system &&
-        this.options.system !== undefined
-      ) {
+      if (this.options && this.options.system && this.options.system !== undefined) {
         gridParams.system = this.options.system
       }
-      if (
-        this.options &&
-        this.options.additionalParamMap &&
-        this.options.additionalParamMap !== undefined
-      ) {
+      if (this.options && this.options.additionalParamMap && this.options.additionalParamMap !== undefined) {
         gridParams.additionalParamMap = this.options.additionalParamMap
       }
+
+      let baseURL
+      if (gridParams.options && gridParams.options.backendUrl) {
+        baseURL = gridParams.options.backendUrl
+      }
+      if (!baseURL) {
+        baseURL = window.$vueApp.config.globalProperties.baseURL
+      }
+      this.baseURL = baseURL
     },
     changeRowStyle(param) {
       // param的格式：{row, rowIndex}
       const gridParams = store.get(this.code)
       if (this.lineEdit && this.lineEdit.editable) {
         if (param.rowIndex === gridParams.$rowIndex) {
-          if (
-            !isObjectValueEqual(
-              param.row,
-              gridParams.orgGridData[gridParams.$rowIndex]
-            )
-          ) {
+          if (!isObjectValueEqual(param.row, gridParams.orgGridData[gridParams.$rowIndex])) {
             // return { 'background': 'rgb(245, 181, 203)' }
           }
         }
@@ -1343,11 +1287,7 @@ export default {
         param.configureOb = this.configureObj
         return gridParams.options.rowStyleRender.call(this, param)
       }
-      if (
-        this.options &&
-        this.options.renderRow &&
-        this.options.renderRow.hasOwnProperty(param.rowIndex)
-      ) {
+      if (this.options && this.options.renderRow && this.options.renderRow.hasOwnProperty(param.rowIndex)) {
         return { background: this.options.renderRow[param.rowIndex] }
       }
     },
@@ -1355,6 +1295,7 @@ export default {
       const gridParams = store.get(this.code)
       let funName = null
       let columnOptions = null
+      let columnStyleSetting = null
       if (param && param.column && param.column.property) {
         if (gridParams && gridParams.columnOptionMap) {
           if (gridParams.columnOptionMap[param.column.property]) {
@@ -1362,6 +1303,10 @@ export default {
             if (columnOptions.events && columnOptions.events.cellStyle) {
               funName = columnOptions.events.cellStyle
             }
+            const controlConfig = getControlConfig(columnOptions)
+            if (controlConfig && controlConfig['cellStyle']) {
+              columnStyleSetting = controlConfig['cellStyle']
+            }
           }
         }
       }
@@ -1370,7 +1315,8 @@ export default {
       if (isHasOptionFunction('cellStyleRender', this.code)) {
         param.additionalParamMap = gridParams.additionalParamMap
         param.pageContext = this.pageContext
-        param.configureOb = this.configureObj
+        param.configureObj = this.configureObj
+        param.cellStyle = columnStyleSetting
         return gridParams.options.cellStyleRender.call(this, param)
       } else if (
         funName !== null &&
@@ -1386,7 +1332,8 @@ export default {
           column: columnOptions,
           prop: param.column.property,
           additionalParamMap: gridParams.additionalParamMap,
-          rowIndex: param.rowIndex
+          rowIndex: param.rowIndex,
+          cellStyle: columnStyleSetting
         }
         return gridParams.options['eventCallBack'][funName].call(this, params)
       }
@@ -1405,11 +1352,7 @@ export default {
           if (this.backgroundColorMap['$selection']) {
             return { background: this.backgroundColorMap['$selection'] }
           }
-        } else if (
-          column.type &&
-          column.type === 'default' &&
-          !column.property
-        ) {
+        } else if (column.type && column.type === 'default' && !column.property) {
           if (this.backgroundColorMap['$index']) {
             return { background: this.backgroundColorMap['$index'] }
           }
@@ -1422,25 +1365,30 @@ export default {
         const gridParams = store.get(this.code)
         let funName = null
         let columnOptions = null
+        let titleStyleSetting = null
         if (param && param.column && param.column.property) {
           if (gridParams && gridParams.columnOptionMap) {
             if (gridParams.columnOptionMap[param.column.property]) {
               columnOptions = gridParams.columnOptionMap[param.column.property]
-              if (
-                columnOptions.events &&
-                columnOptions.events.headerCellStyle
-              ) {
+              if (columnOptions.events && columnOptions.events.headerCellStyle) {
                 funName = columnOptions.events.headerCellStyle
               }
+              const controlConfig = getControlConfig(columnOptions)
+              if (controlConfig && controlConfig['titleStyle']) {
+                titleStyleSetting = controlConfig['titleStyle']
+              }
             }
           }
         }
         // 应用模式
         // 修改表头样式，当某些字段需要编辑时，某些字段不需要编辑时，为了突出显示有权限编辑的字段，可以使用该功能
-        if (
-          gridParams.options.renderHeader &&
-          gridParams.options.renderHeader.props
-        ) {
+        if (isHasOptionFunction('titleStyleRender', this.code)) {
+          param.additionalParamMap = gridParams.additionalParamMap
+          param.pageContext = this.pageContext
+          param.configureObj = this.configureObj
+          param.titleStyle = titleStyleSetting
+          return gridParams.options.titleStyleRender.call(this, param)
+        } else if (gridParams.options.renderHeader && gridParams.options.renderHeader.props) {
           const column = param.column
           const props = gridParams.options.renderHeader.props
           const propsArr = props.split(',')
@@ -1448,9 +1396,7 @@ export default {
             const prop = propsArr[i]
             if (column.property === prop.trim()) {
               let backgroundColor = '#c3f4e2'
-              if (
-                typeof gridParams.options.renderHeader.color !== 'undefined'
-              ) {
+              if (typeof gridParams.options.renderHeader.color !== 'undefined') {
                 backgroundColor = gridParams.options.renderHeader.color
               }
               return { background: backgroundColor }
@@ -1466,6 +1412,7 @@ export default {
         ) {
           // const param = { value: param.row[param.column.property], row: param.row, column: columnOptions, prop: param.column.property }
           param.additionalParamMap = gridParams.additionalParamMap
+          param.titleStyle = titleStyleSetting
           return gridParams.options['eventCallBack'][funName].call(this, param)
         }
       }
@@ -1478,10 +1425,7 @@ export default {
       } else {
         if (gridParams.options && gridParams.options.isAdministerListView) {
           // 根据类型生成静态数据
-          if (
-            gridParams.options.SuperGrid &&
-            gridParams.options.SuperGrid.simulationDate
-          ) {
+          if (gridParams.options.SuperGrid && gridParams.options.SuperGrid.simulationDate) {
             if (isHasOptionFunction('gridDataLoaded', this.code)) {
               const gridData = gridParams.options.gridDataLoaded.call(this, {
                 gridData: gridParams.options.SuperGrid.simulationDate,
@@ -1511,12 +1455,7 @@ export default {
           const isCanRefreshTableData = this.canRefreshTableData(gridParams)
           if (isCanRefreshTableData) {
             // 可以刷新表格记录
-            return this.fetchListData(
-              searchParam,
-              isSearch,
-              parentRowIds,
-              resove
-            )
+            return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
           } else {
             // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
             if (this.isSubTableEmpty(gridParams)) {
@@ -1582,9 +1521,7 @@ export default {
       }
       gridParams.gridData = this.gridData
       // 完成深拷贝，复制一份对象，行编辑时使用
-      gridParams.orgGridData = [].concat(
-        JSON.parse(JSON.stringify(this.gridData))
-      )
+      gridParams.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)))
     },
     canRefreshTableData(gridParams) {
       let isCanRefreshTableData = false
@@ -1642,294 +1579,284 @@ export default {
       return gridData
     },
     fetchListData(searchParam, isSearch, parentRowIds, resove) {
-
-        this.isLoading = true
-        this.hasLoadData = false
-        if (isSearch === undefined || isSearch === false) {
-          // 如果不是查询时才需要从缓存中获得结果
-          // 如果是刷新当前列表，则需要获得缓存中的window.sessionStorage
-          const isRefreshList = window.sessionStorage.getItem(
-            'refreshList-' + this.code
-          )
-          // console.log('fetchData--isRefreshList--', isRefreshList)
-          if (isRefreshList !== undefined && isRefreshList === 'true') {
-            const searchParamJson = window.sessionStorage.getItem(
-              'searchParam-' + this.code
-            )
-            // console.log('fetchData--searchParamJson--', searchParamJson)
-            // console.log('fetchData--pagination--', this.pagination)
-            if (
-              searchParamJson !== undefined &&
-              searchParamJson !== null &&
-              searchParamJson !== ''
-            ) {
-              searchParam = JSON.parse(searchParamJson)
-              const pagination = searchParam.pagination
-              if (pagination) {
-                this.currentPage = pagination.currentPage
-                this.pagination.pageSize = pagination.pageSize
-                this.pagination.showTotal = pagination.showTotal
-              }
-              this.getInitSearchForm(searchParam.searchForm)
-              // this.searchFormContent = searchParam.searchForm
+      this.isLoading = true
+      this.hasLoadData = false
+      // console.log('fetchData--isSearch--', isSearch)
+      if (isSearch === undefined || isSearch === false) {
+        // 如果不是查询时才需要从缓存中获得结果
+        // 如果是刷新当前列表，则需要获得缓存中的window.sessionStorage
+        const isRefreshList = window.sessionStorage.getItem('refreshList-' + this.code)
+        // console.log('fetchData--isRefreshList--', isRefreshList)
+        if (isRefreshList !== undefined && isRefreshList === 'true') {
+          const searchParamJson = window.sessionStorage.getItem('searchParam-' + this.code)
+          // console.log('fetchData--searchParamJson--', searchParamJson)
+          // console.log('fetchData--pagination--', this.pagination)
+          if (searchParamJson !== undefined && searchParamJson !== null && searchParamJson !== '') {
+            searchParam = JSON.parse(searchParamJson)
+            const pagination = searchParam.pagination
+            if (pagination) {
+              this.currentPage = pagination.currentPage
+              this.pagination.pageSize = pagination.pageSize
+              this.pagination.showTotal = pagination.showTotal
             }
+            this.getInitSearchForm(searchParam.searchForm)
+            // this.searchFormContent = searchParam.searchForm
           }
         }
-        window.sessionStorage.removeItem('refreshList-' + this.code)
-        if (searchParam === undefined) {
-          searchParam = this.getSearchParam()
-        }
-        const gridParams = store.get(this.code)
-        let param = searchParam
+      }
+      window.sessionStorage.removeItem('refreshList-' + this.code)
+      if (searchParam === undefined) {
+        searchParam = this.getSearchParam()
+      }
+      const gridParams = store.get(this.code)
+      let param = searchParam
 
-        if (gridParams.options.extraParam || parentRowIds !== undefined) {
-          param = getExtraParam(searchParam, gridParams)
-        }
-        // 导出需要这两个参数
-        gridParams.searchParam = searchParam
-        gridParams.url = this.url
-        let requestUrl = this.url
-        if (parentRowIds !== undefined && parentRowIds !== null) {
-          // 表示是查询子集合时
-          param = Object.assign({}, param)
-          // 清空查询子集合时，分页信息，即不需要分页查询子集合
-          param.searchParam.pagination = null
-          // 父节点id传给后台
-          param['parentIds'] = parentRowIds
-          // 父级字段名，例如：parentId 或 fk_parent_id
-          param['parentProp'] = this.parentProp
-          // 传入系统code
-          param.systemCode = getSystemCode()
+      if (gridParams.options.extraParam || parentRowIds !== undefined) {
+        param = getExtraParam(searchParam, gridParams)
+      }
+      // 导出需要这两个参数
+      gridParams.searchParam = searchParam
+      gridParams.url = this.url
+      let requestUrl = this.url
+      if (parentRowIds !== undefined && parentRowIds !== null) {
+        // 表示是查询子集合时
+        param = Object.assign({}, param)
+        // 清空查询子集合时，分页信息，即不需要分页查询子集合
+        param.searchParam.pagination = null
+        // 父节点id传给后台
+        param['parentIds'] = parentRowIds
+        // 父级字段名，例如：parentId 或 fk_parent_id
+        param['parentProp'] = this.parentProp
+        // 传入系统code
+        param.systemCode = getSystemCode()
 
-          requestUrl = this.options.subRowUrl
-        }
-        // 解决新建后，查询，再点新建报“有未保存的行”问题，解决方案是一旦刷新列表，就还原这些状态
-        gridParams.isCreateRow = false
-        gridParams.isEditRow = false
-        gridParams.$lastSaveRowIndex = null
-        gridParams.$rowIndex = null
-        gridParams.canSaveRow = true
-        // 是否根据权限显示数据
-        gridParams.withDataPermission = gridParams.options.isWithDataPermission
-        // 对象是否是流程实体
-        gridParams.isWorkflowEntity = gridParams.options.isWorkflowEntity
-        // 缓存查询条件及当前页数
-        window.sessionStorage.setItem(
-          'searchParam-' + this.code,
-          JSON.stringify(param)
-        )
-        if (
-          this.parentProp &&
-          searchParam.searchForm &&
-          searchParam.searchForm.length > 0
-        ) {
-          // 表示是树形列表的查询时，查询结果不需要树形显示，后台处理的数据没有加has_children来实现的
-          param.listViewTreeSetting = null
-        }
-         let canFetchData = true
-          if (isHasOptionFunction('beforeRequest', this.code)) {
-            canFetchData = gridParams.options.beforeRequest.call(this, {
-              columns: this.columns,
-              gridParams,
-              additionalParamMap: gridParams.additionalParamMap,
-              requestParam: param,
-              pageContext: this.pageContext,
-              configureObj: this.configureObj
-            })
-          }
-          return new Promise((resolve, reject) => {
-            if(isPromise(canFetchData)){
-              canFetchData.then((result)=>{
-                if(result === undefined || result) {
-                  if(!requestUrl){
-                    resolve()
-                  } else {
-                    this.doRequest(requestUrl, param, parentRowIds, gridParams, resove).then(()=>{
-                      resolve()
-                    }).catch((error)=>{
-                      reject(error)
-                    })
-                  }
-                } else {
-                  console.error('beforeRequest result is false!!')
+        requestUrl = this.options.subRowUrl
+      }
+      // 解决新建后，查询，再点新建报“有未保存的行”问题，解决方案是一旦刷新列表，就还原这些状态
+      gridParams.isCreateRow = false
+      gridParams.isEditRow = false
+      gridParams.$lastSaveRowIndex = null
+      gridParams.$rowIndex = null
+      gridParams.canSaveRow = true
+      // 是否根据权限显示数据
+      gridParams.withDataPermission = gridParams.options.isWithDataPermission
+      // 对象是否是流程实体
+      gridParams.isWorkflowEntity = gridParams.options.isWorkflowEntity
+      // 缓存查询条件及当前页数
+      window.sessionStorage.setItem('searchParam-' + this.code, JSON.stringify(param))
+      if (this.parentProp && searchParam.searchForm && searchParam.searchForm.length > 0) {
+        // 表示是树形列表的查询时，查询结果不需要树形显示，后台处理的数据没有加has_children来实现的
+        param.listViewTreeSetting = null
+      }
+      let canFetchData = true
+      if (isHasOptionFunction('beforeRequest', this.code)) {
+        canFetchData = gridParams.options.beforeRequest.call(this, {
+          columns: this.columns,
+          gridParams,
+          additionalParamMap: gridParams.additionalParamMap,
+          requestParam: param,
+          pageContext: this.pageContext,
+          configureObj: this.configureObj
+        })
+      }
+      // console.log('fetchData--canFetchData--', canFetchData, 'requestUrl=', requestUrl)
+      return new Promise((resolve, reject) => {
+        if (isPromise(canFetchData)) {
+          canFetchData
+            .then((result) => {
+              if (result === undefined || result) {
+                if (!requestUrl) {
+                  gridParams.loaded = true
                   resolve()
-                }
-              }).catch((error)=>{
-                reject(error)
-              })
-            } else {
-              if (canFetchData === undefined || canFetchData === true) {
-                if(!requestUrl){
-                    resolve()
-                  } else {
-                    this.doRequest(requestUrl, param, parentRowIds, gridParams, resove).then(()=>{
+                } else {
+                  this.doRequest(requestUrl, param, parentRowIds, gridParams, resove)
+                    .then(() => {
                       resolve()
-                    }).catch((error)=>{
+                    })
+                    .catch((error) => {
                       reject(error)
                     })
-                  }
+                }
               } else {
                 console.error('beforeRequest result is false!!')
+                gridParams.loaded = true
                 resolve()
               }
+            })
+            .catch((error) => {
+              gridParams.loaded = true
+              reject(error)
+            })
+        } else {
+          if (canFetchData === undefined || canFetchData === true) {
+            if (!requestUrl) {
+              gridParams.loaded = true
+              resolve()
+            } else {
+              this.doRequest(requestUrl, param, parentRowIds, gridParams, resove)
+                .then(() => {
+                  gridParams.loaded = true
+                  resolve()
+                })
+                .catch((error) => {
+                  gridParams.loaded = true
+                  reject(error)
+                })
             }
-          })
+          } else {
+            console.error('beforeRequest result is false!!')
+            gridParams.loaded = true
+            resolve()
+          }
+        }
+      })
     },
     doRequest(requestUrl, param, parentRowIds, gridParams, resove) {
       return new Promise((resolve, reject) => {
-      this.$http
-        .post(requestUrl, param)
-        .then((data) => {
-          if (typeof parentRowIds === 'undefined' || parentRowIds === null) {
-            let tableData = []
-            // 对数据做序列化，比如：处理xss攻击
-            if (isHasOptionFunction('gridDataLoaded', this.code)) {
-              const gridDataLoadedParam = {
-                gridData: data.data,
-                columns: gridParams.columns,
-                additionalParamMap: gridParams.additionalParamMap,
-                pageContext: this.pageContext,
-                configureObj: this.configureObj
-              }
-              if (searchParam) {
-                gridDataLoadedParam.searchForm = searchParam.searchForm
-                gridDataLoadedParam.additionalParamMap =
-                  searchParam.additionalParamMap
-              }
-              const gridData = gridParams.options.gridDataLoaded.call(
-                this,
-                gridDataLoadedParam
-              )
-              if (gridData) {
-                tableData = gridData
+        this.$http
+          .post(requestUrl, param)
+          .then((data) => {
+            if (typeof parentRowIds === 'undefined' || parentRowIds === null) {
+              let tableData = []
+              // 对数据做序列化，比如：处理xss攻击
+              if (isHasOptionFunction('gridDataLoaded', this.code)) {
+                const gridDataLoadedParam = {
+                  gridData: data.data,
+                  columns: gridParams.columns,
+                  additionalParamMap: gridParams.additionalParamMap,
+                  pageContext: this.pageContext,
+                  configureObj: this.configureObj
+                }
+                if (searchParam) {
+                  gridDataLoadedParam.searchForm = searchParam.searchForm
+                  gridDataLoadedParam.additionalParamMap = searchParam.additionalParamMap
+                }
+                const gridData = gridParams.options.gridDataLoaded.call(this, gridDataLoadedParam)
+                if (gridData) {
+                  tableData = gridData
+                } else {
+                  tableData = data.data
+                }
               } else {
                 tableData = data.data
               }
-            } else {
-              tableData = data.data
-            }
-            if (!tableData) {
-              tableData = []
-            }
-            if (gridParams.options.isFormSubTable) {
-              // 子表时默认不全部行编辑
-              if (tableData) {
-                // 子表时所有记录的所有字段设置默认值null，优化子表编辑时性能
-                tableData.forEach((item) => {
-                  this.setColumnsDefaultValue(gridParams.allColumns, item)
-                })
+              if (!tableData) {
+                tableData = []
               }
-              // console.log('子表数据循环', this.gridData)
-              // this.gridData.forEach(item => {
-              //   item.$editing = true
-              // })
-              if (this.pagination && this.isSubTableShowPage === true) {
-                // 表示子表需要显示分页
-                this.subTableData = tableData
-                this.gridData = this.getSubTableGridData(this.subTableData)
-                gridParams.subTableData = this.subTableData
+              if (gridParams.options.isFormSubTable) {
+                // 子表时默认不全部行编辑
+                if (tableData) {
+                  // 子表时所有记录的所有字段设置默认值null，优化子表编辑时性能
+                  tableData.forEach((item) => {
+                    this.setColumnsDefaultValue(gridParams.allColumns, item)
+                  })
+                }
+                // console.log('子表数据循环', this.gridData)
+                // this.gridData.forEach(item => {
+                //   item.$editing = true
+                // })
+                if (this.pagination && this.isSubTableShowPage === true) {
+                  // 表示子表需要显示分页
+                  this.subTableData = tableData
+                  this.gridData = this.getSubTableGridData(this.subTableData)
+                  gridParams.subTableData = this.subTableData
+                } else {
+                  this.gridData = tableData
+                }
+                if (this.pagination) {
+                  this.pagination.total = tableData.length
+                }
               } else {
                 this.gridData = tableData
-              }
-              if (this.pagination) {
-                this.pagination.total = tableData.length
-              }
-            } else {
-              this.gridData = tableData
 
-              if (this.pagination) {
-                this.pagination.total = data.total
+                if (this.pagination) {
+                  this.pagination.total = data.total
+                }
+              }
+              if (data.summaries && Object.keys(data.summaries).length > 0) {
+                this.summaries = data.summaries
               }
-            }
-            if (data.summaries && Object.keys(data.summaries).length > 0) {
-              this.summaries = data.summaries
-            }
 
-            gridParams.gridData = this.gridData
+              gridParams.gridData = this.gridData
 
-            // 完成深拷贝，复制一份对象，行编辑时使用
-            gridParams.orgGridData = [].concat(
-              JSON.parse(JSON.stringify(this.gridData))
-            )
+              // 完成深拷贝，复制一份对象，行编辑时使用
+              gridParams.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)))
 
-            gridParams.pagination = this.pagination
-            gridParams.loaded = true
+              gridParams.pagination = this.pagination
+              gridParams.loaded = true
 
-            // TODO: 输入焦点默认停在第一个可编辑的单元格
-            if (this.lineEdit && this.lineEdit.editable) {
-              if (typeof isSearch === 'undefined' || isSearch === false) {
-                // 不是查询时，才需要创建第一行记录
-                if (this.gridData.length === 0) {
-                  if (
-                    this.options &&
-                    this.options.isDefaultShowEdit !== null &&
-                    this.options.isDefaultShowEdit !== undefined &&
-                    this.options.isDefaultShowEdit === true
-                  ) {
-                    this.createRow(this.code, null, this.gridData)
+              // TODO: 输入焦点默认停在第一个可编辑的单元格
+              if (this.lineEdit && this.lineEdit.editable) {
+                if (typeof isSearch === 'undefined' || isSearch === false) {
+                  // 不是查询时，才需要创建第一行记录
+                  if (this.gridData.length === 0) {
+                    if (
+                      this.options &&
+                      this.options.isDefaultShowEdit !== null &&
+                      this.options.isDefaultShowEdit !== undefined &&
+                      this.options.isDefaultShowEdit === true
+                    ) {
+                      this.createRow(this.code, null, this.gridData)
+                    }
                   }
-                }
-                if (this.gridData.length > 0) {
-                  this.lineEdit['editingCell'] = {
-                    row: 0,
-                    prop: getFirstEditableColumn(this.code),
+                  if (this.gridData.length > 0) {
+                    this.lineEdit['editingCell'] = {
+                      row: 0,
+                      prop: getFirstEditableColumn(this.code)
+                    }
                   }
                 }
               }
-            }
-            this.hasLoadData = true
-          } else {
-            // 对数据做序列化，比如：处理xss攻击
-            if (isHasOptionFunction('gridDataLoaded', this.code)) {
-              gridParams.options.gridDataLoaded.call(this, {
-                gridData: data,
-                additionalParamMap: gridParams.additionalParamMap,
-                pageContext: this.pageContext,
-                configureObj: this.configureObj
-              })
-            }
+              this.hasLoadData = true
+            } else {
+              // 对数据做序列化，比如：处理xss攻击
+              gridParams.loaded = true
+              if (isHasOptionFunction('gridDataLoaded', this.code)) {
+                gridParams.options.gridDataLoaded.call(this, {
+                  gridData: data,
+                  additionalParamMap: gridParams.additionalParamMap,
+                  pageContext: this.pageContext,
+                  configureObj: this.configureObj
+                })
+              }
 
-            if (isHasOptionFunction('loadChildrenComplete', this.code)) {
-              gridParams.options.loadChildrenComplete.call(this, {
-                parentRowIds: parentRowIds,
-                gridData: data,
-                columns: gridParams.columns,
-                additionalParamMap: gridParams.additionalParamMap,
-                pageContext: this.pageContext,
-                configureObj: this.configureObj
-              })
+              if (isHasOptionFunction('loadChildrenComplete', this.code)) {
+                gridParams.options.loadChildrenComplete.call(this, {
+                  parentRowIds: parentRowIds,
+                  gridData: data,
+                  columns: gridParams.columns,
+                  additionalParamMap: gridParams.additionalParamMap,
+                  pageContext: this.pageContext,
+                  configureObj: this.configureObj
+                })
+              }
+              if (typeof resove !== 'undefined' && resove !== null) {
+                // 首次加载或点击三角展开父节点时走该分支
+                // 刷新数据后，移除该父节点下的所有已选中的子节点记录。
+                // 必须调用该方法，否则在删除记录时，数据即使刷新了，已选中集合this.$refs.superGrid.store.states.selection中仍会有该已删除记录，导致再次执行删除报id不存在
+                this.removeGridStoreSelection(parentRowIds)
+                resove(data[parentRowIds[0]])
+              } else {
+                // 刷新父记录对应的子记录集合时需要，例如：删除时
+                parentRowIds.forEach((parentRowId) => {
+                  // 单行父记录id
+                  this.$refs.superGrid.store.states.lazyTreeNodeMap[parentRowId] = data[parentRowId]
+                  this.$refs.superGrid.store.states.treeData[parentRowId].children = data[parentRowId]
+                })
+                // 刷新数据后，移除该父节点下的所有已选中的子节点记录
+                // 必须调用该方法，否则在删除记录时，数据即使刷新了，已选中集合this.$refs.superGrid.store.states.selection中仍会有该已删除记录，导致再次执行删除报id不存在
+                this.removeGridStoreSelection(parentRowIds)
+              }
+              this.hasLoadData = true
             }
-            if (typeof resove !== 'undefined' && resove !== null) {
-              // 首次加载或点击三角展开父节点时走该分支
-              // 刷新数据后，移除该父节点下的所有已选中的子节点记录。
-              // 必须调用该方法，否则在删除记录时，数据即使刷新了，已选中集合this.$refs.superGrid.store.states.selection中仍会有该已删除记录，导致再次执行删除报id不存在
-              this.removeGridStoreSelection(parentRowIds)
-              resove(data[parentRowIds[0]])
-            } else {
-              // 刷新父记录对应的子记录集合时需要，例如：删除时
-              parentRowIds.forEach((parentRowId) => {
-                // 单行父记录id
-                this.$refs.superGrid.store.states.lazyTreeNodeMap[
-                  parentRowId
-                ] = data[parentRowId]
-                this.$refs.superGrid.store.states.treeData[
-                  parentRowId
-                ].children = data[parentRowId]
-              })
-              // 刷新数据后，移除该父节点下的所有已选中的子节点记录
-              // 必须调用该方法，否则在删除记录时，数据即使刷新了，已选中集合this.$refs.superGrid.store.states.selection中仍会有该已删除记录，导致再次执行删除报id不存在
-              this.removeGridStoreSelection(parentRowIds)
+            resolve()
+          })
+          .catch((error) => {
+            if (isHasOptionFunction('loadError', this.code)) {
+              gridParams.options.loadError.call(this, this.code, error)
             }
-            this.hasLoadData = true
-          }
-          resolve()
-        })
-        .catch((error) => {
-          if (isHasOptionFunction('loadError', this.code)) {
-            gridParams.options.loadError.call(this, this.code, error)
-          }
-          reject(error)
-        })
+            reject(error)
+          })
       })
     },
     // 获得初始查询条件对象
@@ -2012,9 +1939,7 @@ export default {
           }
           gridParams.gridData = this.gridData
           // 完成深拷贝，复制一份对象，行编辑时使用
-          gridParams.orgGridData = [].concat(
-            JSON.parse(JSON.stringify(this.gridData))
-          )
+          gridParams.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)))
           gridParams.pagination = this.pagination
 
           // TODO: 输入焦点默认停在第一个可编辑的单元格
@@ -2024,7 +1949,7 @@ export default {
             }
             this.lineEdit['editingCell'] = {
               row: 0,
-              prop: getFirstEditableColumn(this.code),
+              prop: getFirstEditableColumn(this.code)
             }
           }
           if (isHasOptionFunction('gridComplete', this.code)) {
@@ -2088,10 +2013,7 @@ export default {
         }
         if (gridParams.options && gridParams.options.isAdministerListView) {
           // 根据类型生成静态数据
-          if (
-            gridParams.options.SuperGrid &&
-            gridParams.options.SuperGrid.simulationDate
-          ) {
+          if (gridParams.options.SuperGrid && gridParams.options.SuperGrid.simulationDate) {
             let gridData
             if (isHasOptionFunction('gridDataLoaded', vm.code)) {
               gridData = gridParams.options.gridDataLoaded.call(this, {
@@ -2190,27 +2112,20 @@ export default {
       if (this.pagination) {
         // 判断是否删除后请求数据
         if (this.isDelete && this.currentPage > 1) {
-          const pageNum = Math.ceil(
-            (this.pagination.total - this.gridData.length) /
-              this.pagination.pageSize
-          )
-          this.currentPage =
-            this.currentPage > pageNum ? pageNum : this.currentPage
+          const pageNum = Math.ceil((this.pagination.total - this.gridData.length) / this.pagination.pageSize)
+          this.currentPage = this.currentPage > pageNum ? pageNum : this.currentPage
           this.isDelete = false
         }
         const pagination = {
           currentPage: this.currentPage,
           pageSize: this.pagination.pageSize,
-          showTotal: this.pagination.showTotal,
+          showTotal: this.pagination.showTotal
         }
         if (this.pageSize !== null) {
           // 表示更改了每页显示的数据条数
           pagination.pageSize = this.pageSize
         }
-        if (
-          typeof gridParams.currentPage !== 'undefined' &&
-          gridParams.currentPage !== null
-        ) {
+        if (typeof gridParams.currentPage !== 'undefined' && gridParams.currentPage !== null) {
           // 保持页数时使用
           pagination.currentPage = gridParams.currentPage
           // 必须清空一下，否则会导致翻页有问题
@@ -2223,13 +2138,13 @@ export default {
         return {
           currentPage: 1,
           pageSize: 20,
-          showTotal: true,
+          showTotal: true
         }
       }
     },
     getSearchParam() {
       const searchParam = {
-        code: this.code,
+        code: this.code
       }
       const gridParams = store.get(this.code)
       const pagination = this.getPaginationInfo()
@@ -2257,7 +2172,7 @@ export default {
           if (flag) {
             mergeFieldsArr.push({
               prop: mergeField,
-              order: 'ascending',
+              order: 'ascending'
             })
           }
         }
@@ -2265,20 +2180,16 @@ export default {
         searchParam.sorts = mergeFieldsArr
       }
       // 是否有初始过滤条件
-      if (
-        gridParams.options &&
-        typeof gridParams.options.initSearchForm !== 'undefined'
-      ) {
+      if (gridParams.options && typeof gridParams.options.initSearchForm !== 'undefined') {
         searchParam.initSearchForm = gridParams.options.initSearchForm
       }
       if (
         gridParams.query &&
-        typeof gridParams.query.defaultQueryCriteria !== 'undefined'
+        typeof gridParams.query.defaultQueryCriteria !== 'undefined' &&
+        gridParams.query.defaultQueryCriteria !== ''
       ) {
         // json字符串转数组
-        searchParam.defaultQueryCriteria = JSON.parse(
-          gridParams.query.defaultQueryCriteria
-        )
+        searchParam.defaultQueryCriteria = JSON.parse(gridParams.query.defaultQueryCriteria)
       }
       if (typeof gridParams.searchForm !== 'undefined') {
         searchParam.searchForm = gridParams.searchForm
@@ -2301,7 +2212,7 @@ export default {
       }
       return searchParam
     },
-		getComponentType (column) {
+    getComponentType(column) {
       const prop = column.prop
       let type = 'NormalColumn'
       if (prop === '$index') {
@@ -2313,8 +2224,8 @@ export default {
       } else if (prop === undefined && column.children && column.children.length > 0) {
         type = 'GroupColumn'
       }
-			// console.log('%c描述-180428','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',this.myCustomFormatter);
-			// console.log('%c描述-155704','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',type);
+      // console.log('%c描述-180428','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',this.myCustomFormatter);
+      // console.log('%c描述-155704','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',type);
       return type
     },
     focusOnFirstEditableInput() {
@@ -2347,9 +2258,7 @@ export default {
         const gridParams = store.get(this.code)
         gridParams.gridData = this.gridData
         // 完成深拷贝，复制一份对象，行编辑时使用
-        gridParams.orgGridData = [].concat(
-          JSON.parse(JSON.stringify(this.gridData))
-        )
+        gridParams.orgGridData = [].concat(JSON.parse(JSON.stringify(this.gridData)))
       } else {
         this.fetchData(this.getSearchParam())
       }
@@ -2366,9 +2275,7 @@ export default {
         if (!isCanRefreshGrid(this.code)) {
           // 如果最后编辑行没有保存或撤销编辑，则给出提示
           const gridParams = store.get(this.code)
-          console.log(
-            '请先保存或撤销编辑第' + gridParams.$rowIndex + 1 + '行记录，再排序'
-          )
+          console.log('请先保存或撤销编辑第' + gridParams.$rowIndex + 1 + '行记录，再排序')
           this.$refs.superGrid.clearSort()
         } else {
           // TODO: 应该调用fetchData来获取信息，把当前页数、查询条件、排序信息传回后台
@@ -2384,8 +2291,8 @@ export default {
             this.sortInfo = [
               {
                 prop: orgProp,
-                order: order,
-              },
+                order: order
+              }
             ]
           } else {
             this.sortInfo = null
@@ -2399,10 +2306,7 @@ export default {
     isMergeable(prop) {
       for (const column of this.columns) {
         if (column.prop === prop) {
-          if (
-            this.mergeFields &&
-            this.mergeFields.indexOf(column.prop) !== -1
-          ) {
+          if (this.mergeFields && this.mergeFields.indexOf(column.prop) !== -1) {
             return true
           } else {
             return column.span
@@ -2416,7 +2320,7 @@ export default {
         const col = row > 0 ? 1 : 0
         return {
           rowspan: row,
-          colspan: col,
+          colspan: col
         }
       }
     },
@@ -2487,20 +2391,13 @@ export default {
                   // 表示值不存在，需要转小写，再获得一遍
                   const reg1 = /[A-Z]+/ // 大写字母
                   if (this.isSql && reg1.test(prop)) {
-                    fieldValue = getEntityFieldValueWithOutCase(
-                      row,
-                      prop.toLowerCase()
-                    )
+                    fieldValue = getEntityFieldValueWithOutCase(row, prop.toLowerCase())
                     if (fieldValue !== undefined && fieldValue !== null) {
                       numberValue = Number(fieldValue)
                     }
                   }
                 }
-                if (
-                  numberValue !== undefined &&
-                  numberValue !== null &&
-                  !isNaN(numberValue)
-                ) {
+                if (numberValue !== undefined && numberValue !== null && !isNaN(numberValue)) {
                   colTotal += numberValue
                 }
               })
@@ -2528,15 +2425,13 @@ export default {
             onEnd({ newIndex, oldIndex }) {
               const params = {
                 oldIndex: oldIndex,
-                newIndex: newIndex,
+                newIndex: newIndex
               }
-              this.$http
-                .post(this.lineEdit.urlToSaveOrder, params)
-                .then((data) => {
-                  const currRow = vm.gridData.splice(oldIndex, 1)[0]
-                  vm.gridData.splice(newIndex, 0, currRow)
-                })
-            },
+              this.$http.post(this.lineEdit.urlToSaveOrder, params).then((data) => {
+                const currRow = vm.gridData.splice(oldIndex, 1)[0]
+                vm.gridData.splice(newIndex, 0, currRow)
+              })
+            }
           })
         }
       }
@@ -2567,11 +2462,7 @@ export default {
     },
     loadChildrenNode(row, treeNode, resove) {
       const subRowUrl = this.options.subRowUrl
-      if (
-        typeof subRowUrl !== 'undefined' &&
-        subRowUrl !== '' &&
-        subRowUrl !== null
-      ) {
+      if (typeof subRowUrl !== 'undefined' && subRowUrl !== '' && subRowUrl !== null) {
         const parentRowIds = []
         parentRowIds.push(row.id ? row.id : row.ID)
         this.fetchData(this.getSearchParam(), false, parentRowIds, resove)
@@ -2584,9 +2475,7 @@ export default {
           // 折叠时清空表格缓存的已加载的标识位，使其能够动态更新子集合
           // 必须添加这句，否则不会重新走load
           if (this.$refs.superGrid.store.states.treeData) {
-            this.$refs.superGrid.store.states.treeData[
-              row.id ? row.id : row.ID
-            ].loaded = false
+            this.$refs.superGrid.store.states.treeData[row.id ? row.id : row.ID].loaded = false
           }
         } else {
           // console.log('expandChange=this.$refs.superGrid.store.states.lazyTreeNodeMap', this.$refs.superGrid.store.states.lazyTreeNodeMap)
@@ -2598,17 +2487,10 @@ export default {
     removeGridStoreSelection(parentRowIds) {
       let selection = []
       if (this.$refs.superGrid.store.states.selection) {
-        selection = [].concat(
-          JSON.parse(
-            JSON.stringify(this.$refs.superGrid.store.states.selection)
-          )
-        )
+        selection = [].concat(JSON.parse(JSON.stringify(this.$refs.superGrid.store.states.selection)))
       }
       for (let i = 0; i < selection.length; i++) {
-        if (
-          parentRowIds &&
-          parentRowIds.indexOf(selection[i][this.parentProp]) >= 0
-        ) {
+        if (parentRowIds && parentRowIds.indexOf(selection[i][this.parentProp]) >= 0) {
           // 移除第i个元素
           this.$refs.superGrid.store.states.selection.splice(i, 1)
           if (this.$refs.superGrid.store.states.selection.length > 0) {
@@ -2710,11 +2592,7 @@ export default {
           } else {
             backgroundColorMap[item.prop] = '#808080'
           }
-          if (
-            this.backgroundColorMap &&
-            this.backgroundColorMap[item.prop] === '#409EFF' &&
-            this.externalClickFlag
-          ) {
+          if (this.backgroundColorMap && this.backgroundColorMap[item.prop] === '#409EFF' && this.externalClickFlag) {
             backgroundColorMap[item.prop] = '#409EFF'
           }
         }
@@ -2759,8 +2637,7 @@ export default {
         this.rightClickColumn = item
         this.$nextTick(() => {
           const menu = this.$refs.headerMenu.$el
-          const scrollTop =
-            document.documentElement.scrollTop || document.body.scrollTop
+          const scrollTop = document.documentElement.scrollTop || document.body.scrollTop
           menu.style.display = 'block'
           menu.style.left = event.clientX + 'px'
           // 当滑动滚动条时也能准确获取菜单位置
@@ -2794,19 +2671,14 @@ export default {
           let needValidate = true
           if (isHasEditOption('isEnableValidate', this.code)) {
             // 表示配置了是否启用必填验证
-            needValidate =
-              this.gridParams.options.lineEditOptions['isEnableValidate']
+            needValidate = this.gridParams.options.lineEditOptions['isEnableValidate']
           }
           let validateResult = true
           if (needValidate === true) {
             let pageNum
             // 每页的记录下标，提示时使用
             let pageRowIndex
-            if (
-              this.isSubTableShowPage &&
-              pageSize !== undefined &&
-              pageSize > 0
-            ) {
+            if (this.isSubTableShowPage && pageSize !== undefined && pageSize > 0) {
               pageNum = Math.ceil((i + 1) / pageSize)
               pageRowIndex = i + 1 - (pageNum - 1) * pageSize
             }
@@ -2821,10 +2693,7 @@ export default {
             )
           }
           if (validateResult !== null && validateResult !== undefined) {
-            if (
-              typeof validateResult === 'string' ||
-              validateResult === false
-            ) {
+            if (typeof validateResult === 'string' || validateResult === false) {
               return false
             }
           }
@@ -2838,16 +2707,11 @@ export default {
     },
     rowDblclickEvent(row, column, event) {
       const gridParams = store.get(this.code)
-      if (
-        gridParams.options &&
-        gridParams.options.isFormSubTable &&
-        gridParams.options.isPdfEditor
-      ) {
+      if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.isPdfEditor) {
         // 如果是子表并且是pdf模式
       } else if (this.isFormSubTable) {
         // 表示是表单的子表，点击时需要将当前行设为行编辑状态，并保存上一行的记录（不是保存到数据库，只是把编辑状态改为false）
-        if (column.property &&
-        column.property !== 'operation') {
+        if (column.property && column.property !== 'operation') {
           let canEdit = true
           const gridParams = store.get(this.code)
           if (isEditOptionFunction('beforeEdit', this.code)) {
@@ -2859,7 +2723,7 @@ export default {
               listCode: this.code,
               entity: row,
               columns: gridParams.columns,
-              isMobile: false,
+              isMobile: this.isMobile,
               pageGridData: isSubTableShowPage ? gridParams.gridData : null,
               pageSize,
               additionalParamMap: gridParams.additionalParamMap,
@@ -2881,22 +2745,14 @@ export default {
         }
       } else {
         if (row) {
-          if (
-            gridParams &&
-            gridParams.lineEdit &&
-            gridParams.lineEdit.editable &&
-            gridParams.canntEdit
-          ) {
+          if (gridParams && gridParams.lineEdit && gridParams.lineEdit.editable && gridParams.canntEdit) {
             let index = this.gridData.findIndex(function (item) {
-              return (
-                (item.id && item.id === row.id) ||
-                (item.ID && item.ID === row.ID)
-              )
+              return (item.id && item.id === row.id) || (item.ID && item.ID === row.ID)
             })
             if (index < 0) {
               index = 0
             }
-            this.editRow(index)
+            this.editRow(index, this.code)
           }
         }
       }
@@ -2906,16 +2762,12 @@ export default {
       // 取消上一行的编辑状态
       let editRows
       if (this.isSubTableShowPage) {
-        editRows = this.subTableData.filter(
-          row => row.$editing !== undefined && row.$editing === true
-        )
+        editRows = this.subTableData.filter((row) => row.$editing !== undefined && row.$editing === true)
       } else {
-        editRows = this.gridData.filter(
-          row => row.$editing !== undefined && row.$editing === true
-        )
+        editRows = this.gridData.filter((row) => row.$editing !== undefined && row.$editing === true)
       }
       if (editRows && editRows.length > 0) {
-        editRows.forEach(editRow => {
+        editRows.forEach((editRow) => {
           setEntityFieldValue(editRow, '$editing', false)
           // 取消上一行选中状态时，触发un-edit事件，处理下拉多选选项组问题
           eventBus.$emit('un-edit', { row: editRow })
@@ -2957,30 +2809,35 @@ export default {
         jumpMode = openPageParams.jumpMode
       }
       const popPageSetting = openPageParams
-      if(this.pageContext){
+      if (this.pageContext) {
         // 新页面设计组件中弹框或刷新区域时
-        if (jumpMode === 'popup' || jumpMode === 'refresh') {
+        const isMobile = this.isMobile
+        if (jumpMode === 'popup' || jumpMode === 'refresh' || (isMobile && jumpMode === 'newTab')) {
           // 弹出页面
           const gridParams = store.get(this.code)
           this.jumpPageSetting = popPageSetting
           const isSubTableShowPage = gridParams.isSubTableShowPage
           // 每页显示多少条
           const pageSize = gridParams.pagination && gridParams.pagination.pageSize
-          const isMobile = false
           const row = popPageSetting.row
           const eventParams = {
             position: popPageSetting._position,
             listCode: popPageSetting._listCode,
             rowIndex: popPageSetting._rowIndex,
             row: popPageSetting.row,
-            id: row?(row.ID?row.ID:row.id):null,
+            columnProp: popPageSetting._columnProp,
+            id: row ? (row.ID ? row.ID : row.id) : null,
             isMobile,
-            gridData: isSubTableShowPage
-                  ? gridParams.subTableData
-                  : gridParams.gridData,
+            gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
             pageGridData: isSubTableShowPage ? gridParams.gridData : null,
-            pageSize }
-          this.$emit('new-open-grid-dialog', {pageContext: this.pageContext,configureObj: this.configureObj, eventParams, jumpPageSetting: this.jumpPageSetting})
+            pageSize
+          }
+          this.$emit('new-open-grid-dialog', {
+            pageContext: this.pageContext,
+            configureObj: this.configureObj,
+            eventParams,
+            jumpPageSetting: this.jumpPageSetting
+          })
         }
       } else {
         if (jumpMode === 'popup') {
@@ -3020,13 +2877,13 @@ export default {
     },
     // 刷新列表数据
     refresData(data) {
-	    const gridParams = store.get(this.code)
-	    gridParams.gridData = data
-	    store.set(this.code, gridParams)
-	    if (this.parentFormData) {
-		    this.parentFormData[this.code] = data
-	    }
-	    this['gridData'] = data
+      const gridParams = store.get(this.code)
+      gridParams.gridData = data
+      store.set(this.code, gridParams)
+      if (this.parentFormData) {
+        this.parentFormData[this.code] = data
+      }
+      this['gridData'] = data
     },
     refresPortData(port, value, index) {
       if (this.gridData[index]) {
@@ -3057,11 +2914,15 @@ export default {
     openFold(isOpen) {
       this.resizeTableHeight()
     },
-    // 设置字段禁止编辑
+    /**
+     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
+     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
+     */
     fnProhibitToEdit(entity) {
-			if (entity) {
-				if (entity.isForceUpdate) {
+      if (entity) {
+        if (entity.isForceUpdate) {
           this.$emit('fn-prohibit-to-edit', entity)
+          this.$emit('prohibitToEdit', entity)
         }
         for (const key in entity) {
           // console.log('key', key)
@@ -3074,7 +2935,10 @@ export default {
         }
       }
     },
-    // 设置字段禁止编辑
+    /**
+     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
+     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
+     */
     prohibitToEdit(entity) {
       this.fnProhibitToEdit(entity)
     },
@@ -3082,11 +2946,11 @@ export default {
     getTreeProps(parentProp, isSql, isLazy, dataSourceType) {
       let treeProps = {
         children: 'children',
-        hasChildren: '_has_children',
+        hasChildren: '_has_children'
       }
       if (parentProp) {
         treeProps = {
-          children: 'children',
+          children: 'children'
         }
         let hasChildren = 'hasChildren'
         if (isLazy) {
@@ -3108,20 +2972,19 @@ export default {
       store.set(this.code, gridParams)
       this['subTableData'] = data
     },
+    refreshList() {
+      this.fetchData(this.getSearchParam())
+    },
     // 选择记录
-    selectRecord(selection, row){
+    selectRecord(selection, row) {
       let selectRecordEventResult = true
       const gridParams = store.get(this.code)
       if (isHasOptionFunction('selectRecord', this.code)) {
         selectRecordEventResult = gridParams.options.selectRecord.call(this, {
-          gridData: this.isSubTableShowPage
-            ? this.subTableData
-            : this.gridData,
+          gridData: this.isSubTableShowPage ? this.subTableData : this.gridData,
           columns: gridParams.columns,
           superGrid: this.$refs.superGrid,
-          pageGridData: this.isSubTableShowPage
-            ? this.gridData
-            : null,
+          pageGridData: this.isSubTableShowPage ? this.gridData : null,
           additionalParamMap: gridParams.additionalParamMap,
           selection: selection,
           row: row,
@@ -3129,7 +2992,7 @@ export default {
           pageContext: this.pageContext,
           configureObj: this.configureObj
         })
-        if(selectRecordEventResult !== undefined &&  selectRecordEventResult=== false){
+        if (selectRecordEventResult !== undefined && selectRecordEventResult === false) {
           // 最后选中的记录取消选中状态
           this.$refs.superGrid.toggleRowSelection(row, false)
         }
@@ -3137,26 +3000,22 @@ export default {
       this.select(selection, row)
     },
     // 取消选择记录
-    selectAllRecord(selection){
+    selectAllRecord(selection) {
       let selectAllRecordsEventResult = true
       const gridParams = store.get(this.code)
       if (isHasOptionFunction('selectAllRecords', this.code)) {
         selectAllRecordsEventResult = gridParams.options.selectAllRecords.call(this, {
-          gridData: this.isSubTableShowPage
-            ? this.subTableData
-            : this.gridData,
+          gridData: this.isSubTableShowPage ? this.subTableData : this.gridData,
           columns: gridParams.columns,
           superGrid: this.$refs.superGrid,
-          pageGridData: this.isSubTableShowPage
-            ? this.gridData
-            : null,
+          pageGridData: this.isSubTableShowPage ? this.gridData : null,
           additionalParamMap: gridParams.additionalParamMap,
           selection: selection,
           parentFormData: this.parentFormData,
           pageContext: this.pageContext,
           configureObj: this.configureObj
         })
-        if(selectAllRecordsEventResult !== undefined &&  selectAllRecordsEventResult=== false){
+        if (selectAllRecordsEventResult !== undefined && selectAllRecordsEventResult === false) {
           // 取消所有记录选中状态
           this.$refs.superGrid.toggleAllSelection()
         }
@@ -3164,18 +3023,14 @@ export default {
       this.selectAll(selection)
     },
     // 选择记录发生改变时
-    selectionChangeEvent(newSelection){
+    selectionChangeEvent(newSelection) {
       const gridParams = store.get(this.code)
       if (isHasOptionFunction('selectionChange', this.code)) {
         gridParams.options.selectionChange.call(this, {
-          gridData: this.isSubTableShowPage
-            ? this.subTableData
-            : this.gridData,
+          gridData: this.isSubTableShowPage ? this.subTableData : this.gridData,
           columns: gridParams.columns,
           superGrid: this.$refs.superGrid,
-          pageGridData: this.isSubTableShowPage
-            ? this.gridData
-            : null,
+          pageGridData: this.isSubTableShowPage ? this.gridData : null,
           additionalParamMap: gridParams.additionalParamMap,
           selection: newSelection,
           parentFormData: this.parentFormData,
@@ -3189,6 +3044,48 @@ export default {
       }
       this.selectionChange(newSelection)
     },
+    // 显示移动端查询区域
+    showMobileSearch() {
+      console.log('showMobileSearch-----this.isShowMobileSearch=', this.isShowMobileSearch, 'isMobile=', this.isMobile)
+      this.isShowMobileSearch = true
+      if (this.$refs.sf) {
+        // 获得查询区高度
+        this.$refs.sf.showMobileSearch()
+      }
+    },
+    // 移动端选择文件结束
+    pickFileDone(data) {
+      console.log(
+        'superPage5555---pickFileDone--data.componentId=',
+        data.componentId,
+        'data.listCode=',
+        data.listCode,
+        'data=',
+        data
+      )
+      if (data && data.componentId) {
+        eventBus.$emit(data.componentId + '-pickFileDone', data)
+      }
+    },
+    // 移动端上传文件结束
+    uploadFileDone(data) {
+      if (data && data.componentId) {
+        eventBus.$emit(data.componentId + '-uploadFileDone', data)
+      }
+    },
+    // 移动端扫描结束
+    scanDone(data) {
+      if (data && data.componentId) {
+        eventBus.$emit(data.componentId + '-scanDone', data)
+      }
+    },
+    openRowForm(rowIndex) {
+      this.currentEditRowIndex = rowIndex
+      this.showRowForm = true
+    },
+    closeRowForm() {
+      this.showRowForm = false
+    }
   },
   emits: [
     'change-grid-data',
@@ -3201,9 +3098,8 @@ export default {
     'un-edit',
     'refresMainTableFields',
     'refresh',
-    'cancel-search',
-    ,
-  ],
+    'cancel-search'
+  ]
 }
 </script>