yanghao 1 nedēļu atpakaļ
vecāks
revīzija
a2ebf1ae4c
2 mainītis faili ar 520 papildinājumiem un 349 dzēšanām
  1. 8 3
      src/components/ZmTable/ZmTableColumn.vue
  2. 512 346
      src/views/pms/device/index.vue

+ 8 - 3
src/components/ZmTable/ZmTableColumn.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup generic="T">
 import { type TableColumnCtx } from 'element-plus'
-import { computed, inject, nextTick, ref, useAttrs, watch } from 'vue'
+import { computed, inject, nextTick, ref, useAttrs, useSlots, watch } from 'vue'
 import { TableContextKey } from './token'
 import ZmTableColumnSettingTree from './ZmTableColumnSettingTree.vue'
 import type { ColumnAlign, ColumnSettingItem, SortChangePayload, SortOrder } from './token'
@@ -35,6 +35,7 @@ const emits = defineEmits<{
 
 const props = defineProps<Props>()
 const attrs = useAttrs()
+const slots = useSlots()
 
 const tableContext = inject(TableContextKey, {
   data: ref([]),
@@ -52,6 +53,10 @@ const innerSortOrder = ref<SortOrder | null>(props.defaultSortOrder ?? null)
 const filterVisible = ref(false)
 const settingVisible = ref(false)
 const hasHeaderAction = computed(() => props.action || props.zmSortable || props.zmFilterable)
+const forwardedSlots = computed(() => {
+  const { header: _header, ...restSlots } = slots
+  return restSlots
+})
 
 const defaultOptions = ref<Partial<Props>>({
   align: 'center',
@@ -236,8 +241,8 @@ watch(
 
 <template>
   <el-table-column ref="columnRef" v-bind="bindProps">
-    <template v-for="(_, name) in $slots" :key="name" #[name]="slotData">
-      <slot v-if="name !== 'header'" :name="name" v-bind="slotData || {}"></slot>
+    <template v-for="(_, name) in forwardedSlots" :key="name" #[name]="slotData">
+      <slot :name="name" v-bind="slotData || {}"></slot>
     </template>
     <template #header="scope">
       <slot name="header" v-bind="scope">

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 512 - 346
src/views/pms/device/index.vue


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels