sh-view 2.9.3 → 2.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh-view",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "基于vxe-table二次封装,更包含Alert,Badge,Card,CodeEditor,Col,Corner,CountTo,Drawer,Empty,Form,Header,Icon,List,Loading,Modal,Noticebar,Poptip,Progress,PullRefresh,Query,Result,Row,Split,Grid,Table,Tabs,Tag,Toolbar,Tree,Upload,WaterFall,WaterMark等丰富组件库",
   "main": "packages/index.js",
   "typings": "types/index.d.ts",

package/packages/components/sh-table/js/tableMethods.js

@@ -17,6 +17,20 @@ const getDefaultMessage = (renderType, title) => {
 	return message
 }
 
+// 表格序号构造方法
+export const seqMethod = ({ $table, seq, $rowIndex }, pagerConfig) => {
+	const pageStart = (+pagerConfig.pageSize || 50) * ((+pagerConfig.currentPage || 1) - 1)
+	if (pagerConfig && pagerConfig.enabled) {
+		if (String(seq).includes('.')) {
+			const seqIndex = seq.indexOf('.')
+			const seqStart = seq.substr(0, seqIndex)
+			return $vUtils.add(pageStart, seqStart) + seq.substr(seqIndex)
+		}
+		return $vUtils.add(pageStart, seq)
+	}
+	return seq
+}
+
 // 表格打印、导出统一过滤列
 export const columnDefaultFilterMethod = ({ column, $columnIndex }) => {
 	let field = column.field

package/packages/components/sh-table/js/useTable.js

@@ -1,5 +1,5 @@
 import { computed, onMounted, reactive, ref, watch, nextTick } from 'vue'
-import { columnDefaultFilterMethod, tableFooterCompute, getTransfarFields, formulaReplaceAll } from './tableMethods'
+import { seqMethod, columnDefaultFilterMethod, tableFooterCompute, getTransfarFields, formulaReplaceAll, seqMethod } from './tableMethods'
 
 // 记录自定义参数，传给vxe要过滤掉
 let omitProps = [
@@ -130,20 +130,7 @@ export default function (props, context, proxy, isGrid) {
 	})
 	const tableSeqConfig = computed(() => {
 		const pagerConfig = tablePagerConfig.value
-		const pageStart = (+pagerConfig.pageSize || 50) * ((+pagerConfig.currentPage || 1) - 1)
-		return {
-			seqMethod: ({ $table, seq, $rowIndex }) => {
-				if (pagerConfig && pagerConfig.enabled) {
-					if (String(seq).includes('.')) {
-						const seqIndex = seq.indexOf('.')
-						const seqStart = seq.substr(0, seqIndex)
-						return $vUtils.add(pageStart, seqStart) + seq.substr(seqIndex)
-					}
-					return $vUtils.add(pageStart, seq)
-				}
-				return seq
-			}
-		}
+		return Object.assign({ seqMethod: obj => seqMethod(obj, pagerConfig) }, props.seqConfig)
 	})
 	const tableMoneyConfig = computed(() => {
 		return Object.assign({ style: { width: '60px' } }, $vTableSetup.moneyConfig, props.moneyConfig, tableVmConfig.value)