vue2-client 1.15.105 → 1.15.107

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

@@ -1,597 +1,597 @@
-<template>
-  <!-- 当expandedGrid存在时渲染带有expandedRowRender的表格 -->
-  <s-table
-    v-if="tableContext.expandedGrid"
-    ref="expandableTable"
-    :id="tableContext.uniqueId"
-    :alert="true"
-    :columns="realTableColumns"
-    :data="loadData()"
-    :rowKey="tableContext.rowKey"
-    :showSummary="tableContext.showSummary"
-    :rowSelection="tableContext.rowSelection"
-    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
-    :showPagination="tableContext.showPagination"
-    :hidePagination="tableContext.simpleMode"
-    :showSelected="!tableContext.simpleMode"
-    :pageSize="tableContext.simpleMode ? 1000 : undefined"
-    :pageMaxSize="tableContext.pageMaxSize"
-    :setScrollYHeight="tableContext.setScrollYHeight"
-    :selectRowMode="tableContext.selectRowMode"
-    :size="tableContext.tableSize"
-    :components="components"
-    :rowStyleFunction="tableContext.rowStyleFunction"
-    @beforeDataChange="beforeDataChange"
-    @expand="onExpand"
-    @rowClick="handleRowClick"
-  >
-    <template
-      v-for="(item, c_index) in realTableColumns"
-      :slot="item.dataIndex"
-      slot-scope="text, record, index">
-      <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
-        <x-form-item
-          class="innerTable"
-          :style="{ paddingTop: 0, paddingBottom: 0, paddingLeft: 0, paddingRight: 0 }"
-          :form="record"
-          :attr="getFromItem(item.dataIndex,text, record, index)"
-          :service-name="tableContext.serviceName"
-          mode="新增/修改"
-          :env="tableContext.env"
-          :setForm="(obj)=>tableContext.setForm(record,obj)"
-          @rowChoose="(row, attr, callback) => tableContext.rowChoose(row, attr, callback, record)"
-          :showLabel="false"
-          :key="'editRow-' + c_index"
-        />
-      </template>
-      <span v-else-if="item.slotType === 'rate'" :key="'rate-' + c_index">
-        <x-rate
-          :value="text"
-          :disabled="true"
-          :allow-half="item.allowHalf"
-          :icon="item.rateIcon"
-          :max-count="item.maxCount"
-          style="zoom:0.9"/>
-      </span>
-      <span v-else-if="item.slotType === 'index'" :key="'index-' + c_index">
-        {{ index + 1 }}
-      </span>
-      <CustomFuncCel
-        :text="text"
-        :record="text"
-        :index="index"
-        :item="item"
-        :localDataSource="activeTable?.localDataSource"
-        v-else-if="item.slotCustomFunction"
-        :key="'customJs-' + c_index"></CustomFuncCel>
-      <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
-        <a @click="tableContext.columnClick(item.dataIndex,text,record)">{{ text }}</a>
-      </span>
-      <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
-        <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
-      </span>
-      <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
-        <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
-      </span>
-      <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
-        <x-badge
-          :service-name="tableContext.serviceName"
-          :env="tableContext.env"
-          v-if="text !== null && text !== undefined"
-          :badge-key="item.slotKeyMap"
-          :value="text"/>
-      </span>
-      <span v-else-if="item.slotType === 'date'" :key="'date-' + c_index">
-        {{ format(text, 'yyyy-MM-dd') }}
-      </span>
-      <span v-else-if="item.slotType === 'dateTime'" :key="'dateTime-' + c_index">
-        {{ format(text, 'yyyy-MM-dd hh:mm:ss') }}
-      </span>
-      <span v-else-if="item.slotType === 'towDecimal'" :key="'towDecimal-' + c_index">
-        {{ numberFormat(text, 2) }}
-      </span>
-      <span v-else-if="item.slotType === 'fourDecimal'" :key="'fourDecimal-' + c_index">
-        {{ numberFormat(text, 4) }}
-      </span>
-      <span v-else-if="item.slotType === 'int'" :key="'int-' + c_index">
-        {{ numberFormat(text, 0) }}
-      </span>
-      <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
-        <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown placement="bottomCenter" :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
-            <a class="ant-dropdown-link" @click="e => e.preventDefault()">
-              {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay" style="min-width: 60px">
-              <a-menu-item
-                v-for="(action_item, actionIndex) in item.actionArr"
-                :key="actionIndex"
-                v-show="!action_item.customFunction || tableContext.customFunctionShow(action_item.customFunction,record,c_index)">
-                <a
-                  style="text-align: center"
-                  @click="tableContext.action(record, item.dataIndex, action_item.func)"
-                >{{ action_item.text }}</a>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </template>
-        <template v-if="!item.actionArr || item.actionArr.length === 0">
-          <a @click="tableContext.action(record, item.dataIndex,'action', index)">{{ item.slotValue }}</a>
-        </template>
-      </span>
-    </template>
-    <template slot="expandedRowRender" slot-scope="record">
-      <slot
-        name="expandedRowRender"
-        :selectedRowKeys="tableContext.selectedRowKeys"
-        :selectedRows="tableContext.selectedRows"
-        :record="record"
-      ></slot>
-    </template>
-    <template slot="footer">
-      <slot
-        name="footer"
-        :selectedRowKeys="tableContext.selectedRowKeys"
-        :selectedRows="tableContext.selectedRows"></slot>
-    </template>
-  </s-table>
-
-  <!-- 当expandedGrid不存在时渲染不带expandedRowRender的表格 -->
-  <s-table
-    v-else
-    ref="simpleTable"
-    :id="tableContext.uniqueId"
-    :alert="true"
-    :columns="realTableColumns"
-    :data="loadData()"
-    :rowKey="tableContext.rowKey"
-    :showSummary="tableContext.showSummary"
-    :rowSelection="tableContext.rowSelection"
-    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
-    :showPagination="tableContext.showPagination"
-    :hidePagination="tableContext.simpleMode"
-    :showSelected="!tableContext.simpleMode"
-    :pageSize="tableContext.simpleMode ? 1000 : undefined"
-    :pageMaxSize="tableContext.pageMaxSize"
-    :setScrollYHeight="tableContext.setScrollYHeight"
-    :selectRowMode="tableContext.selectRowMode"
-    :size="tableContext.tableSize"
-    :components="components"
-    :rowStyleFunction="tableContext.rowStyleFunction"
-    @rowClick="handleRowClick"
-    @beforeDataChange="beforeDataChange"
-  >
-    <template
-      v-for="(item, c_index) in realTableColumns"
-      :slot="item.dataIndex"
-      slot-scope="text, record, index">
-      <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
-        <x-form-item
-          class="innerTable"
-          :style="{ paddingTop: 0, paddingBottom: 0, paddingLeft: 0, paddingRight: 0 }"
-          :form="record"
-          :attr="getFromItem(item.dataIndex,text, record, index)"
-          :service-name="tableContext.serviceName"
-          mode="新增/修改"
-          :env="tableContext.env"
-          :setForm="(obj)=>tableContext.setForm(record,obj)"
-          @rowChoose="(row, attr, callback) => tableContext.rowChoose(row, attr, callback, record)"
-          :showLabel="false"
-          :key="'editRow-' + c_index"
-        />
-      </template>
-      <span v-else-if="item.slotType === 'rate'" :key="'rate-' + c_index">
-        <x-rate
-          :value="text"
-          :disabled="true"
-          :allow-half="item.allowHalf"
-          :icon="item.rateIcon"
-          :max-count="item.maxCount"
-          style="zoom:0.9"/>
-      </span>
-      <span v-else-if="item.slotType === 'index'" :key="'index-' + c_index">
-        {{ index + 1 }}
-      </span>
-      <CustomFuncCel
-        :text="text"
-        :record="text"
-        :index="index"
-        :item="item"
-        :localDataSource="activeTable?.localDataSource"
-        v-else-if="item.slotCustomFunction"
-        :key="'customJs-' + c_index"></CustomFuncCel>
-      <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
-        <a @click="tableContext.columnClick(item.dataIndex,text,record)">{{ text }}</a>
-      </span>
-      <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
-        <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
-      </span>
-      <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
-        <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
-      </span>
-      <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
-        <x-badge
-          :service-name="tableContext.serviceName"
-          :env="tableContext.env"
-          v-if="text !== null && text !== undefined"
-          :badge-key="item.slotKeyMap"
-          :value="text"/>
-      </span>
-      <span v-else-if="item.slotType === 'date'" :key="'date-' + c_index">
-        {{ format(text, 'yyyy-MM-dd') }}
-      </span>
-      <span v-else-if="item.slotType === 'dateTime'" :key="'dateTime-' + c_index">
-        {{ format(text, 'yyyy-MM-dd hh:mm:ss') }}
-      </span>
-      <span v-else-if="item.slotType === 'towDecimal'" :key="'towDecimal-' + c_index">
-        {{ numberFormat(text, 2) }}
-      </span>
-      <span v-else-if="item.slotType === 'fourDecimal'" :key="'fourDecimal-' + c_index">
-        {{ numberFormat(text, 4) }}
-      </span>
-      <span v-else-if="item.slotType === 'int'" :key="'int-' + c_index">
-        {{ numberFormat(text, 0) }}
-      </span>
-      <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
-        <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown placement="bottomCenter" :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
-            <a class="ant-dropdown-link" @click="e => e.preventDefault()">
-              {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay" style="min-width: 60px">
-              <a-menu-item
-                v-for="(action_item, actionIndex) in item.actionArr"
-                :key="actionIndex"
-                v-show="!action_item.customFunction || tableContext.customFunctionShow(action_item.customFunction,record,c_index)">
-                <a
-                  style="text-align: center"
-                  @click="tableContext.action(record, item.dataIndex, action_item.func)"
-                >{{ action_item.text }}</a>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </template>
-        <template v-if="!item.actionArr || item.actionArr.length === 0">
-          <a @click="tableContext.action(record, item.dataIndex,'action', index)">{{ item.slotValue }}</a>
-        </template>
-      </span>
-    </template>
-    <template slot="footer">
-      <slot
-        name="footer"
-        :selectedRowKeys="tableContext.selectedRowKeys"
-        :selectedRows="tableContext.selectedRows"></slot>
-    </template>
-  </s-table>
-</template>
-
-<script>
-import { Ellipsis, STable } from '@vue2-client/components'
-import { formatDate } from '@vue2-client/utils/util'
-import XBadge from '@vue2-client/base-client/components/common/XBadge'
-import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import CustomFuncCel from '@vue2-client/base-client/components/common/XTable/CustomFuncCel.vue'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-import XRate from '@vue2-client/base-client/components/common/XRate/index.vue'
-import VueDraggableResizable from 'vue-draggable-resizable'
-
-export default {
-  name: 'XTableWrapper',
-  components: {
-    Ellipsis,
-    STable,
-    XBadge,
-    XFormItem,
-    XRate,
-    CustomFuncCel,
-    VueDraggableResizable
-  },
-  data () {
-    return {
-      isDragging: false, // 添加拖拽状态标记
-      // eslint-disable-next-line vue/no-reserved-keys
-      _rafId: null // 添加requestAnimationFrame ID标记
-    }
-  },
-  computed: {
-    localDataSource () {
-      return this.activeTable?.localDataSource
-    },
-    // 获取当前活动的表格实例
-    activeTable () {
-      return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
-    },
-    realTableColumns () {
-      return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction)
-    },
-    components () {
-      return {
-        header: {
-          cell: (h, props, children) => {
-            const { key, ...restProps } = props
-            // 此处的this.realTableColumns 是定义的table的表头属性变量
-            const col = this.realTableColumns.find((col) => {
-              const k = col.dataIndex || col.key
-              return k === key
-            })
-            if (!col || !col.width || col.slotType === 'action') {
-              if (children) {
-                return h('th', { ...restProps }, [...children])
-              } else {
-                return h('th', { ...restProps })
-              }
-            }
-
-            // 创建一个防止点击排序的容器
-            const preventSortProps = {
-              style: {
-                position: 'absolute',
-                right: 0,
-                top: 0,
-                width: '20px',
-                height: '100%',
-                zIndex: 10
-              },
-              on: {
-                mousedown: (e) => {
-                  e.stopPropagation()
-                  e.preventDefault()
-                  this.isDragging = true
-                }
-              }
-            }
-
-            const dragProps = {
-              key: col.dataIndex || col.key,
-              class: 'table-draggable-handle',
-              attrs: {
-                w: 10,
-                x: col.width,
-                z: 1,
-                axis: 'x',
-                draggable: true,
-                resizable: false,
-              },
-              on: {
-                dragging: (x, y) => {
-                  // 使用requestAnimationFrame优化性能，减少卡顿
-                  if (!this._rafId) {
-                    this._rafId = requestAnimationFrame(() => {
-                      col.width = Math.max(x, 50) // 设置最小列宽为50px
-                      this.isDragging = true // 设置拖拽状态
-                      this._rafId = null
-                    })
-                  }
-                },
-                mousedown: (e) => {
-                  // 阻止事件冒泡，防止触发排序
-                  e.stopPropagation()
-                  e.preventDefault()
-                  this.isDragging = true // 设置拖拽状态
-                },
-                dragstop: () => {
-                  // 清除可能存在的动画帧请求
-                  if (this._rafId) {
-                    cancelAnimationFrame(this._rafId)
-                    this._rafId = null
-                  }
-
-                  // 拖拽结束时，延迟重置拖拽状态，以防止排序被触发
-                  setTimeout(() => {
-                    this.isDragging = false
-                  }, 100)
-                }
-              },
-              nativeOn: {
-                mousedown: (e) => {
-                  e.stopPropagation()
-                  e.preventDefault()
-                  this.isDragging = true // 设置拖拽状态
-                }
-              }
-            }
-
-            const preventSort = h('div', preventSortProps)
-            const drag = h('vue-draggable-resizable', { ...dragProps })
-
-            // 修改th的点击事件，在拖拽状态下阻止排序
-            const newRestProps = { ...restProps }
-            const originalClick = newRestProps.on && newRestProps.on.click
-            if (originalClick) {
-              newRestProps.on = {
-                ...newRestProps.on,
-                click: (e) => {
-                  if (this.isDragging) {
-                    e.stopPropagation()
-                    e.preventDefault()
-                    return
-                  }
-                  originalClick(e)
-                }
-              }
-            }
-
-            if (children) {
-              return h('th', { ...newRestProps, class: 'resize-table-th' }, [...children, preventSort, drag])
-            } else {
-              return h('th', { ...newRestProps, class: 'resize-table-th' }, [preventSort, drag])
-            }
-          },
-        }
-      }
-    }
-  },
-  props: {
-    loadSelectedData: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    disableAction: {
-      type: Boolean,
-      default: false
-    }
-  },
-  inject: ['tableContext'],
-  methods: {
-    handleRowClick (record) {
-      this.$emit('rowClick', record)
-    },
-    beforeDataChange (record) {
-      this.$emit('beforeDataChange', record)
-    },
-    onExpand (expanded, record) {
-      this.$emit('expand', expanded, record)
-    },
-    setLocalDataSource (data) {
-      this.activeTable?.setLocalDataSource(data)
-    },
-    loadData () {
-      if (this.loadSelectedData) {
-        return this.loadSelectedDataGen
-      } else {
-        return this.tableContext.loadData
-      }
-    },
-    loadSelectedDataGen (requestParameters) {
-      console.log('loadSelectedDataGen', {
-        pageNo: requestParameters?.pageNo,
-        pageSize: requestParameters?.pageSize
-      })
-
-      const { pageNo = 1, pageSize = 10 } = requestParameters || {}
-      const startIndex = (pageNo - 1) * pageSize
-      const endIndex = startIndex + pageSize
-      const paginatedData = this.tableContext.selectedRows.slice(startIndex, endIndex)
-
-      return new Promise((resolve) => {
-        resolve({
-          data: paginatedData,
-          pageNo,
-          pageSize,
-          totalPage: Math.ceil(this.tableContext.selectedRows.length / pageSize),
-          totalCount: this.tableContext.selectedRows.length
-        })
-      })
-    },
-    updateSelect (selectedRowKeys, selectedRows) {
-      this.activeTable?.updateSelect(selectedRowKeys, selectedRows)
-    },
-    clearSelected () {
-      this.activeTable?.clearSelected()
-    },
-    refresh (bool) {
-      this.activeTable?.refresh(bool)
-    },
-
-    /**
-     * 格式化日期
-     * @param date 日期字符串
-     * @param format 格式化方式
-     */
-    format (date, format) {
-      return formatDate(date, format)
-    },
-    /**
-     * 格式化数字
-     * @param number string 或者 number
-     * @param decimalPlaces 小数位数
-     */
-    numberFormat (number, decimalPlaces = 2) {
-      const value = parseFloat(number)
-      if (!isNaN(value)) {
-        return value.toFixed(decimalPlaces)
-      } else {
-        return ''
-      }
-    },
-    getFromItem (model, text, record, index) {
-      const aa = this.tableContext.formItems.reduce((acc, item) => {
-        if (item.type === 'group') {
-          const foundItem = item.groupItems.find(_item => _item.model === model && _item.editRow)
-          if (foundItem) {
-            acc = foundItem
-          }
-        } else if (item.model === model && item.editRow) {
-          acc = item
-        }
-        return acc
-      }, null)
-      if (aa) {
-        const tempConfig = JSON.parse(JSON.stringify(aa))
-        // 如果找到了字段
-        const ColumnIndex = this.realTableColumns.findIndex(item => item.dataIndex === model)
-        // 并且表单项是日期框
-        if (ColumnIndex !== -1 && ['yearPicker', 'monthPicker', 'datePicker', 'rangePicker'].includes(tempConfig.type)) {
-          // 修改他的列宽
-          this.realTableColumns[ColumnIndex].width = 220
-        }
-        // 如果有检验规则检验是数字
-        if (ColumnIndex !== -1 && ['number', 'integer', 'float'].includes(tempConfig?.rule?.type)) {
-          // 修改他的列宽
-          tempConfig.numberInput = true
-        }
-        if (tempConfig.editRowShowFunc) {
-          if (executeStrFunctionByContext(this.tableContext, tempConfig.editRowShowFunc, [text, record, index, tempConfig])) {
-            return tempConfig
-          }
-        } else {
-          return tempConfig
-        }
-      }
-      return false
-    },
-    handleResizeColumn (w, col) {
-      col.width = w
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-:deep(.ant-table-fixed-right) {
-  overflow: visible !important;
-}
-</style>
-<style>
-.table-draggable-handle {
-  height: 100% !important;
-  left: auto !important;
-  right: -10px;
-  cursor: col-resize;
-  touch-action: none;
-  border: none;
-  position: absolute;
-  transform: none !important;
-  bottom: 0;
-  width: 20px !important;
-}
-
-.table-draggable-handle::after {
-  content: "";
-  position: absolute;
-  top: 50%;
-  height: 20px;
-  width: 1px;
-  background-color: #ebebeb;
-  transition: background-color 0.2s;
-  transform: translateY(-50%);
-  right: 9px;
-}
-
-.table-draggable-handle:hover::after {
-  background-color: #1890ff;
-}
-
-.table-draggable-handle:active::after {
-  background-color: #096dd9;
-}
-
-.resize-table-th {
-  position: relative;
-}
-
-.resize-table-th:hover .table-draggable-handle::after {
-  background-color: rgba(24, 144, 255, 0.5);
-}
-</style>
+<template>
+  <!-- 当expandedGrid存在时渲染带有expandedRowRender的表格 -->
+  <s-table
+    v-if="tableContext.expandedGrid"
+    ref="expandableTable"
+    :id="tableContext.uniqueId"
+    :alert="true"
+    :columns="realTableColumns"
+    :data="loadData()"
+    :rowKey="tableContext.rowKey"
+    :showSummary="tableContext.showSummary"
+    :rowSelection="tableContext.rowSelection"
+    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
+    :showPagination="tableContext.showPagination"
+    :hidePagination="tableContext.simpleMode"
+    :showSelected="!tableContext.simpleMode"
+    :pageSize="tableContext.simpleMode ? 1000 : undefined"
+    :pageMaxSize="tableContext.pageMaxSize"
+    :setScrollYHeight="tableContext.setScrollYHeight"
+    :selectRowMode="tableContext.selectRowMode"
+    :size="tableContext.tableSize"
+    :components="components"
+    :rowStyleFunction="tableContext.rowStyleFunction"
+    @beforeDataChange="beforeDataChange"
+    @expand="onExpand"
+    @rowClick="handleRowClick"
+  >
+    <template
+      v-for="(item, c_index) in realTableColumns"
+      :slot="item.dataIndex"
+      slot-scope="text, record, index">
+      <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
+        <x-form-item
+          class="innerTable"
+          :style="{ paddingTop: 0, paddingBottom: 0, paddingLeft: 0, paddingRight: 0 }"
+          :form="record"
+          :attr="getFromItem(item.dataIndex,text, record, index)"
+          :service-name="tableContext.serviceName"
+          mode="新增/修改"
+          :env="tableContext.env"
+          :setForm="(obj)=>tableContext.setForm(record,obj)"
+          @rowChoose="(row, attr, callback) => tableContext.rowChoose(row, attr, callback, record)"
+          :showLabel="false"
+          :key="'editRow-' + c_index"
+        />
+      </template>
+      <span v-else-if="item.slotType === 'rate'" :key="'rate-' + c_index">
+        <x-rate
+          :value="text"
+          :disabled="true"
+          :allow-half="item.allowHalf"
+          :icon="item.rateIcon"
+          :max-count="item.maxCount"
+          style="zoom:0.9"/>
+      </span>
+      <span v-else-if="item.slotType === 'index'" :key="'index-' + c_index">
+        {{ index + 1 }}
+      </span>
+      <CustomFuncCel
+        :text="text"
+        :record="text"
+        :index="index"
+        :item="item"
+        :localDataSource="activeTable?.localDataSource"
+        v-else-if="item.slotCustomFunction"
+        :key="'customJs-' + c_index"></CustomFuncCel>
+      <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
+        <a @click="tableContext.columnClick(item.dataIndex,text,record)">{{ text }}</a>
+      </span>
+      <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
+        <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
+      </span>
+      <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
+        <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
+      </span>
+      <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
+        <x-badge
+          :service-name="tableContext.serviceName"
+          :env="tableContext.env"
+          v-if="text !== null && text !== undefined"
+          :badge-key="item.slotKeyMap"
+          :value="text"/>
+      </span>
+      <span v-else-if="item.slotType === 'date'" :key="'date-' + c_index">
+        {{ format(text, 'yyyy-MM-dd') }}
+      </span>
+      <span v-else-if="item.slotType === 'dateTime'" :key="'dateTime-' + c_index">
+        {{ format(text, 'yyyy-MM-dd hh:mm:ss') }}
+      </span>
+      <span v-else-if="item.slotType === 'towDecimal'" :key="'towDecimal-' + c_index">
+        {{ numberFormat(text, 2) }}
+      </span>
+      <span v-else-if="item.slotType === 'fourDecimal'" :key="'fourDecimal-' + c_index">
+        {{ numberFormat(text, 4) }}
+      </span>
+      <span v-else-if="item.slotType === 'int'" :key="'int-' + c_index">
+        {{ numberFormat(text, 0) }}
+      </span>
+      <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
+        <template v-if="item.actionArr && item.actionArr.length > 0">
+          <a-dropdown placement="bottomCenter" :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
+            <a class="ant-dropdown-link" @click="e => e.preventDefault()">
+              {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay" style="min-width: 60px">
+              <a-menu-item
+                v-for="(action_item, actionIndex) in item.actionArr"
+                :key="actionIndex"
+                v-show="!action_item.customFunction || tableContext.customFunctionShow(action_item.customFunction,record,c_index)">
+                <a
+                  style="text-align: center"
+                  @click="tableContext.action(record, item.dataIndex, action_item.func)"
+                >{{ action_item.text }}</a>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </template>
+        <template v-if="!item.actionArr || item.actionArr.length === 0">
+          <a @click="tableContext.action(record, item.dataIndex,'action', index)">{{ item.slotValue }}</a>
+        </template>
+      </span>
+    </template>
+    <template slot="expandedRowRender" slot-scope="record">
+      <slot
+        name="expandedRowRender"
+        :selectedRowKeys="tableContext.selectedRowKeys"
+        :selectedRows="tableContext.selectedRows"
+        :record="record"
+      ></slot>
+    </template>
+    <template slot="footer">
+      <slot
+        name="footer"
+        :selectedRowKeys="tableContext.selectedRowKeys"
+        :selectedRows="tableContext.selectedRows"></slot>
+    </template>
+  </s-table>
+
+  <!-- 当expandedGrid不存在时渲染不带expandedRowRender的表格 -->
+  <s-table
+    v-else
+    ref="simpleTable"
+    :id="tableContext.uniqueId"
+    :alert="true"
+    :columns="realTableColumns"
+    :data="loadData()"
+    :rowKey="tableContext.rowKey"
+    :showSummary="tableContext.showSummary"
+    :rowSelection="tableContext.rowSelection"
+    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
+    :showPagination="tableContext.showPagination"
+    :hidePagination="tableContext.simpleMode"
+    :showSelected="!tableContext.simpleMode"
+    :pageSize="tableContext.simpleMode ? 1000 : undefined"
+    :pageMaxSize="tableContext.pageMaxSize"
+    :setScrollYHeight="tableContext.setScrollYHeight"
+    :selectRowMode="tableContext.selectRowMode"
+    :size="tableContext.tableSize"
+    :components="components"
+    :rowStyleFunction="tableContext.rowStyleFunction"
+    @rowClick="handleRowClick"
+    @beforeDataChange="beforeDataChange"
+  >
+    <template
+      v-for="(item, c_index) in realTableColumns"
+      :slot="item.dataIndex"
+      slot-scope="text, record, index">
+      <template v-if="tableContext.isEditMode && getFromItem(item.dataIndex,text, record, index)">
+        <x-form-item
+          class="innerTable"
+          :style="{ paddingTop: 0, paddingBottom: 0, paddingLeft: 0, paddingRight: 0 }"
+          :form="record"
+          :attr="getFromItem(item.dataIndex,text, record, index)"
+          :service-name="tableContext.serviceName"
+          mode="新增/修改"
+          :env="tableContext.env"
+          :setForm="(obj)=>tableContext.setForm(record,obj)"
+          @rowChoose="(row, attr, callback) => tableContext.rowChoose(row, attr, callback, record)"
+          :showLabel="false"
+          :key="'editRow-' + c_index"
+        />
+      </template>
+      <span v-else-if="item.slotType === 'rate'" :key="'rate-' + c_index">
+        <x-rate
+          :value="text"
+          :disabled="true"
+          :allow-half="item.allowHalf"
+          :icon="item.rateIcon"
+          :max-count="item.maxCount"
+          style="zoom:0.9"/>
+      </span>
+      <span v-else-if="item.slotType === 'index'" :key="'index-' + c_index">
+        {{ index + 1 }}
+      </span>
+      <CustomFuncCel
+        :text="text"
+        :record="text"
+        :index="index"
+        :item="item"
+        :localDataSource="activeTable?.localDataSource"
+        v-else-if="item.slotCustomFunction"
+        :key="'customJs-' + c_index"></CustomFuncCel>
+      <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
+        <a @click="tableContext.columnClick(item.dataIndex,text,record)">{{ text }}</a>
+      </span>
+      <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
+        <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
+      </span>
+      <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
+        <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
+      </span>
+      <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
+        <x-badge
+          :service-name="tableContext.serviceName"
+          :env="tableContext.env"
+          v-if="text !== null && text !== undefined"
+          :badge-key="item.slotKeyMap"
+          :value="text"/>
+      </span>
+      <span v-else-if="item.slotType === 'date'" :key="'date-' + c_index">
+        {{ format(text, 'yyyy-MM-dd') }}
+      </span>
+      <span v-else-if="item.slotType === 'dateTime'" :key="'dateTime-' + c_index">
+        {{ format(text, 'yyyy-MM-dd hh:mm:ss') }}
+      </span>
+      <span v-else-if="item.slotType === 'towDecimal'" :key="'towDecimal-' + c_index">
+        {{ numberFormat(text, 2) }}
+      </span>
+      <span v-else-if="item.slotType === 'fourDecimal'" :key="'fourDecimal-' + c_index">
+        {{ numberFormat(text, 4) }}
+      </span>
+      <span v-else-if="item.slotType === 'int'" :key="'int-' + c_index">
+        {{ numberFormat(text, 0) }}
+      </span>
+      <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
+        <template v-if="item.actionArr && item.actionArr.length > 0">
+          <a-dropdown placement="bottomCenter" :getPopupContainer=" triggerNode => { return triggerNode.parentNode } ">
+            <a class="ant-dropdown-link" @click="e => e.preventDefault()">
+              {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
+            </a>
+            <a-menu slot="overlay" style="min-width: 60px">
+              <a-menu-item
+                v-for="(action_item, actionIndex) in item.actionArr"
+                :key="actionIndex"
+                v-show="!action_item.customFunction || tableContext.customFunctionShow(action_item.customFunction,record,c_index)">
+                <a
+                  style="text-align: center"
+                  @click="tableContext.action(record, item.dataIndex, action_item.func)"
+                >{{ action_item.text }}</a>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </template>
+        <template v-if="!item.actionArr || item.actionArr.length === 0">
+          <a @click="tableContext.action(record, item.dataIndex,'action', index)">{{ item.slotValue }}</a>
+        </template>
+      </span>
+    </template>
+    <template slot="footer">
+      <slot
+        name="footer"
+        :selectedRowKeys="tableContext.selectedRowKeys"
+        :selectedRows="tableContext.selectedRows"></slot>
+    </template>
+  </s-table>
+</template>
+
+<script>
+import { Ellipsis, STable } from '@vue2-client/components'
+import { formatDate } from '@vue2-client/utils/util'
+import XBadge from '@vue2-client/base-client/components/common/XBadge'
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+import CustomFuncCel from '@vue2-client/base-client/components/common/XTable/CustomFuncCel.vue'
+import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import XRate from '@vue2-client/base-client/components/common/XRate/index.vue'
+import VueDraggableResizable from 'vue-draggable-resizable'
+
+export default {
+  name: 'XTableWrapper',
+  components: {
+    Ellipsis,
+    STable,
+    XBadge,
+    XFormItem,
+    XRate,
+    CustomFuncCel,
+    VueDraggableResizable
+  },
+  data () {
+    return {
+      isDragging: false, // 添加拖拽状态标记
+      // eslint-disable-next-line vue/no-reserved-keys
+      _rafId: null // 添加requestAnimationFrame ID标记
+    }
+  },
+  computed: {
+    localDataSource () {
+      return this.activeTable?.localDataSource
+    },
+    // 获取当前活动的表格实例
+    activeTable () {
+      return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
+    },
+    realTableColumns () {
+      return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction)
+    },
+    components () {
+      return {
+        header: {
+          cell: (h, props, children) => {
+            const { key, ...restProps } = props
+            // 此处的this.realTableColumns 是定义的table的表头属性变量
+            const col = this.realTableColumns.find((col) => {
+              const k = col.dataIndex || col.key
+              return k === key
+            })
+            if (!col || !col.width || col.slotType === 'action') {
+              if (children) {
+                return h('th', { ...restProps }, [...children])
+              } else {
+                return h('th', { ...restProps })
+              }
+            }
+
+            // 创建一个防止点击排序的容器
+            const preventSortProps = {
+              style: {
+                position: 'absolute',
+                right: 0,
+                top: 0,
+                width: '20px',
+                height: '100%',
+                zIndex: 10
+              },
+              on: {
+                mousedown: (e) => {
+                  e.stopPropagation()
+                  e.preventDefault()
+                  this.isDragging = true
+                }
+              }
+            }
+
+            const dragProps = {
+              key: col.dataIndex || col.key,
+              class: 'table-draggable-handle',
+              attrs: {
+                w: 10,
+                x: col.width,
+                z: 1,
+                axis: 'x',
+                draggable: true,
+                resizable: false,
+              },
+              on: {
+                dragging: (x, y) => {
+                  // 使用requestAnimationFrame优化性能，减少卡顿
+                  if (!this._rafId) {
+                    this._rafId = requestAnimationFrame(() => {
+                      col.width = Math.max(x, 50) // 设置最小列宽为50px
+                      this.isDragging = true // 设置拖拽状态
+                      this._rafId = null
+                    })
+                  }
+                },
+                mousedown: (e) => {
+                  // 阻止事件冒泡，防止触发排序
+                  e.stopPropagation()
+                  e.preventDefault()
+                  this.isDragging = true // 设置拖拽状态
+                },
+                dragstop: () => {
+                  // 清除可能存在的动画帧请求
+                  if (this._rafId) {
+                    cancelAnimationFrame(this._rafId)
+                    this._rafId = null
+                  }
+
+                  // 拖拽结束时，延迟重置拖拽状态，以防止排序被触发
+                  setTimeout(() => {
+                    this.isDragging = false
+                  }, 100)
+                }
+              },
+              nativeOn: {
+                mousedown: (e) => {
+                  e.stopPropagation()
+                  e.preventDefault()
+                  this.isDragging = true // 设置拖拽状态
+                }
+              }
+            }
+
+            const preventSort = h('div', preventSortProps)
+            const drag = h('vue-draggable-resizable', { ...dragProps })
+
+            // 修改th的点击事件，在拖拽状态下阻止排序
+            const newRestProps = { ...restProps }
+            const originalClick = newRestProps.on && newRestProps.on.click
+            if (originalClick) {
+              newRestProps.on = {
+                ...newRestProps.on,
+                click: (e) => {
+                  if (this.isDragging) {
+                    e.stopPropagation()
+                    e.preventDefault()
+                    return
+                  }
+                  originalClick(e)
+                }
+              }
+            }
+
+            if (children) {
+              return h('th', { ...newRestProps, class: 'resize-table-th' }, [...children, preventSort, drag])
+            } else {
+              return h('th', { ...newRestProps, class: 'resize-table-th' }, [preventSort, drag])
+            }
+          },
+        }
+      }
+    }
+  },
+  props: {
+    loadSelectedData: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    disableAction: {
+      type: Boolean,
+      default: false
+    }
+  },
+  inject: ['tableContext'],
+  methods: {
+    handleRowClick (record) {
+      this.$emit('rowClick', record)
+    },
+    beforeDataChange (record) {
+      this.$emit('beforeDataChange', record)
+    },
+    onExpand (expanded, record) {
+      this.$emit('expand', expanded, record)
+    },
+    setLocalDataSource (data) {
+      this.activeTable?.setLocalDataSource(data)
+    },
+    loadData () {
+      if (this.loadSelectedData) {
+        return this.loadSelectedDataGen
+      } else {
+        return this.tableContext.loadData
+      }
+    },
+    loadSelectedDataGen (requestParameters) {
+      console.log('loadSelectedDataGen', {
+        pageNo: requestParameters?.pageNo,
+        pageSize: requestParameters?.pageSize
+      })
+
+      const { pageNo = 1, pageSize = 10 } = requestParameters || {}
+      const startIndex = (pageNo - 1) * pageSize
+      const endIndex = startIndex + pageSize
+      const paginatedData = this.tableContext.selectedRows.slice(startIndex, endIndex)
+
+      return new Promise((resolve) => {
+        resolve({
+          data: paginatedData,
+          pageNo,
+          pageSize,
+          totalPage: Math.ceil(this.tableContext.selectedRows.length / pageSize),
+          totalCount: this.tableContext.selectedRows.length
+        })
+      })
+    },
+    updateSelect (selectedRowKeys, selectedRows) {
+      this.activeTable?.updateSelect(selectedRowKeys, selectedRows)
+    },
+    clearSelected () {
+      this.activeTable?.clearSelected()
+    },
+    refresh (bool) {
+      this.activeTable?.refresh(bool)
+    },
+
+    /**
+     * 格式化日期
+     * @param date 日期字符串
+     * @param format 格式化方式
+     */
+    format (date, format) {
+      return formatDate(date, format)
+    },
+    /**
+     * 格式化数字
+     * @param number string 或者 number
+     * @param decimalPlaces 小数位数
+     */
+    numberFormat (number, decimalPlaces = 2) {
+      const value = parseFloat(number)
+      if (!isNaN(value)) {
+        return value.toFixed(decimalPlaces)
+      } else {
+        return ''
+      }
+    },
+    getFromItem (model, text, record, index) {
+      const aa = this.tableContext.formItems.reduce((acc, item) => {
+        if (item.type === 'group') {
+          const foundItem = item.groupItems.find(_item => _item.model === model && _item.editRow)
+          if (foundItem) {
+            acc = foundItem
+          }
+        } else if (item.model === model && item.editRow) {
+          acc = item
+        }
+        return acc
+      }, null)
+      if (aa) {
+        const tempConfig = JSON.parse(JSON.stringify(aa))
+        // 如果找到了字段
+        const ColumnIndex = this.realTableColumns.findIndex(item => item.dataIndex === model)
+        // 并且表单项是日期框
+        if (ColumnIndex !== -1 && ['yearPicker', 'monthPicker', 'datePicker', 'rangePicker'].includes(tempConfig.type)) {
+          // 修改他的列宽
+          this.realTableColumns[ColumnIndex].width = 220
+        }
+        // 如果有检验规则检验是数字
+        if (ColumnIndex !== -1 && ['number', 'integer', 'float'].includes(tempConfig?.rule?.type)) {
+          // 修改他的列宽
+          tempConfig.numberInput = true
+        }
+        if (tempConfig.editRowShowFunc) {
+          if (executeStrFunctionByContext(this.tableContext, tempConfig.editRowShowFunc, [text, record, index, tempConfig])) {
+            return tempConfig
+          }
+        } else {
+          return tempConfig
+        }
+      }
+      return false
+    },
+    handleResizeColumn (w, col) {
+      col.width = w
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+:deep(.ant-table-fixed-right) {
+  overflow: visible !important;
+}
+</style>
+<style>
+.table-draggable-handle {
+  height: 100% !important;
+  left: auto !important;
+  right: -10px;
+  cursor: col-resize;
+  touch-action: none;
+  border: none;
+  position: absolute;
+  transform: none !important;
+  bottom: 0;
+  width: 20px !important;
+}
+
+.table-draggable-handle::after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  height: 20px;
+  width: 1px;
+  background-color: #ebebeb;
+  transition: background-color 0.2s;
+  transform: translateY(-50%);
+  right: 9px;
+}
+
+.table-draggable-handle:hover::after {
+  background-color: #1890ff;
+}
+
+.table-draggable-handle:active::after {
+  background-color: #096dd9;
+}
+
+.resize-table-th {
+  position: relative;
+}
+
+.resize-table-th:hover .table-draggable-handle::after {
+  background-color: rgba(24, 144, 255, 0.5);
+}
+</style>