ele-admin-plus 1.1.9-beta.1 → 1.1.9-beta.11

package/lib/ele-tree-select/props.d.ts

@@ -1,7 +1,8 @@
-import type { PropType, ExtractPropTypes } from 'vue';
-import type { ElTreeV2Props } from '../ele-app/el';
-import type { SelectValue, SingleValue } from '../ele-basic-select/types';
-import type { ShowCheckedStrategy } from './types';
+import { ShowCheckedStrategy } from './types';
+import { SelectValue, SingleValue } from '../ele-basic-select/types';
+import { ElTreeV2Props } from '../ele-app/el';
+import { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -16,13 +17,13 @@ export declare const treeSelectProps: {
     /** 是否禁用 */
     disabled: BooleanConstructor;
     /** 尺寸 */
-    size: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never> | undefined>;
+    size: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never> | undefined>;
     /** 是否支持清除 */
     clearable: BooleanConstructor;
     /** 无选中时提示文本 */
     placeholder: StringConstructor;
     /** 缓存数据 */
-    cacheData: PropType<import("element-plus/es/components/tree-v2/src/types").TreeData | undefined>;
+    cacheData: PropType<import('element-plus/es/components/tree-v2/src/types').TreeData | undefined>;
     /** 树配置 */
     treeProps: {
         type: PropType<ElTreeV2Props>;
@@ -38,7 +39,7 @@ export declare const treeSelectProps: {
     maxTagTextLength: NumberConstructor;
     /** 多选标签类型 */
     tagType: {
-        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
+        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
         default: string;
     };
     /** 是否在输入框获得焦点后自动弹出选项菜单 */
@@ -57,7 +58,7 @@ export declare const treeSelectProps: {
     };
     /** 下拉框位置 */
     placement: {
-        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
+        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
         default: string;
     };
     /** 下拉框渐变动画 */
@@ -66,15 +67,15 @@ export declare const treeSelectProps: {
         default: string;
     };
     /** popper.js 参数 */
-    popperOptions: PropType<Partial<import("element-plus").Options> | undefined>;
+    popperOptions: PropType<Partial<import('element-plus').Options> | undefined>;
     /** 下拉框类名 */
     popperClass: StringConstructor;
     /** 下拉框宽度 */
     popperWidth: (StringConstructor | NumberConstructor)[];
     /** 自定义样式 */
-    selectStyle: PropType<Partial<import("vue").CSSProperties>>;
+    selectStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 自定义输入框样式 */
-    inputStyle: PropType<Partial<import("vue").CSSProperties>>;
+    inputStyle: PropType<Partial<import('vue').CSSProperties>>;
 };
 export type TreeSelectProps = ExtractPropTypes<typeof treeSelectProps>;
 /**

package/lib/ele-tree-select/util.d.ts

@@ -1,5 +1,6 @@
-import type { MultipleValue, SelectedItem } from '../ele-basic-select/types';
-import type { TreeData } from './types';
+import { TreeData } from './types';
+import { MultipleValue, SelectedItem } from '../ele-basic-select/types';
+
 /**
  * 获取平铺后的数据值和数据
  * @param data 数据

package/lib/ele-upload-list/components/list-item.cjs

@@ -24,6 +24,8 @@ const _sfc_main = vue.defineComponent({
     readonly: Boolean,
     /** 是否禁用 */
     disabled: Boolean,
+    /** 自定义条目样式 */
+    imageProps: Object,
     /** 进度条属性 */
     progressProps: Object,
     /** 国际化 */
@@ -85,11 +87,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[2] || (_cache[2] = (...args) => _ctx.onItemClick && _ctx.onItemClick(...args))
   }, [
     vue.renderSlot(_ctx.$slots, "thumbnail", { item: _ctx.item }, () => [
-      _ctx.item.url ? (vue.openBlock(), vue.createBlock(_component_ElImage, {
+      _ctx.item.url ? (vue.openBlock(), vue.createBlock(_component_ElImage, vue.mergeProps({
         key: 0,
-        fit: "cover",
+        fit: "cover"
+      }, _ctx.imageProps || {}, {
         src: _ctx.item.url
-      }, null, 8, ["src"])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
+      }), null, 16, ["src"])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
         vue.createVNode(_component_ElIcon, null, {
           default: vue.withCtx(() => [
             vue.createVNode(_component_FileOutlined)

package/lib/ele-upload-list/components/list-item.d.ts

@@ -1,7 +1,8 @@
-import type { PropType } from 'vue';
-import type { ElProgressProps } from '../../ele-app/el';
-import type { UploadItem, UploadLocale } from '../types';
-declare const _default: import("vue").DefineComponent<{
+import { UploadItem, UploadLocale } from '../types';
+import { ElProgressProps, ElImageProps } from '../../ele-app/el';
+import { PropType } from 'vue';
+
+declare const _default: import('vue').DefineComponent<{
     /** 数据 */
     item: {
         type: PropType<UploadItem>;
@@ -11,6 +12,8 @@ declare const _default: import("vue").DefineComponent<{
     readonly: BooleanConstructor;
     /** 是否禁用 */
     disabled: BooleanConstructor;
+    /** 自定义条目样式 */
+    imageProps: PropType<ElImageProps>;
     /** 进度条属性 */
     progressProps: PropType<ElProgressProps>;
     /** 国际化 */
@@ -36,6 +39,8 @@ declare const _default: import("vue").DefineComponent<{
     readonly: BooleanConstructor;
     /** 是否禁用 */
     disabled: BooleanConstructor;
+    /** 自定义条目样式 */
+    imageProps: PropType<ElImageProps>;
     /** 进度条属性 */
     progressProps: PropType<ElProgressProps>;
     /** 国际化 */
@@ -44,9 +49,9 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
 }>> & {
+    onRetry?: ((_item: UploadItem) => any) | undefined;
     onItemClick?: ((_item: UploadItem) => any) | undefined;
     onRemove?: ((_item: UploadItem) => any) | undefined;
-    onRetry?: ((_item: UploadItem) => any) | undefined;
 }, {
     disabled: boolean;
     readonly: boolean;

package/lib/ele-upload-list/index.cjs

@@ -20,7 +20,6 @@ const _sfc_main = vue.defineComponent({
   props: props.uploadListProps,
   emits: props.uploadListEmits,
   setup(props2, { emit }) {
-    const { authenticated } = receiver.useLicense();
     const { lang } = receiver.useLocale("upload", props2);
     const previewRef = vue.ref(null);
     const previewOption = vue.reactive({
@@ -54,7 +53,7 @@ const _sfc_main = vue.defineComponent({
       emit("update:modelValue", value);
     };
     const onUpload = (file) => {
-      if (!authenticated.value || !uploadEnable.value || props2.disabled) {
+      if (!uploadEnable.value || props2.disabled) {
         return false;
       }
       const item = {
@@ -136,6 +135,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         readonly: _ctx.readonly,
         disabled: _ctx.disabled,
         progressProps: _ctx.progressProps,
+        imageProps: _ctx.imageProps,
         locale: _ctx.lang,
         style: vue.normalizeStyle(_ctx.itemStyle),
         class: vue.normalizeClass({
@@ -153,7 +153,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1032, ["item", "readonly", "disabled", "progressProps", "locale", "style", "class", "onItemClick", "onRemove", "onRetry"])
+      ]), 1032, ["item", "readonly", "disabled", "progressProps", "imageProps", "locale", "style", "class", "onItemClick", "onRemove", "onRetry"])
     ]),
     footer: vue.withCtx(() => [
       _ctx.uploadEnable ? (vue.openBlock(), vue.createElementBlock("div", {
@@ -184,15 +184,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }, 8, ["drag", "accept", "multiple", "disabled", "beforeUpload"])
       ], 4)) : vue.createCommentVNode("", true),
       vue.createElementVNode("div", _hoisted_1, [
-        _ctx.previewOption.visible ? (vue.openBlock(), vue.createBlock(_component_ElImage, {
+        _ctx.previewOption.visible ? (vue.openBlock(), vue.createBlock(_component_ElImage, vue.mergeProps({
           key: 0,
-          ref: "previewRef",
           hideOnClickModal: true,
-          previewTeleported: true,
+          previewTeleported: true
+        }, _ctx.previewProps || {}, {
+          ref: "previewRef",
           src: _ctx.previewOption.current,
           previewSrcList: _ctx.previewOption.images,
           initialIndex: _ctx.previewOption.currentIndex
-        }, null, 8, ["src", "previewSrcList", "initialIndex"])) : vue.createCommentVNode("", true)
+        }), null, 16, ["src", "previewSrcList", "initialIndex"])) : vue.createCommentVNode("", true)
       ])
     ]),
     _: 3

package/lib/ele-upload-list/index.d.ts

@@ -1,6 +1,7 @@
-import type { ElImageInstance } from '../ele-app/el';
-import type { UploadItem, UploadLocale } from './types';
-declare const _default: import("vue").DefineComponent<{
+import { UploadItem, UploadLocale } from './types';
+import { ElImageInstance } from '../ele-app/el';
+
+declare const _default: import('vue').DefineComponent<{
     modelValue: {
         type: import("vue").PropType<UploadItem[]>;
         required: boolean;
@@ -24,7 +25,10 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<boolean | Record<string | number | symbol, any>>;
         default: boolean;
     };
+    imageProps: import("vue").PropType<import("../ele-app/el").ElImageProps>;
     progressProps: import("vue").PropType<import("../ele-app/el").ElProgressProps>;
+    previewProps: import("vue").PropType<import("../ele-app/el").ElImageProps>;
+    /** 当前图片地址 */
     locale: import("vue").PropType<Partial<UploadLocale>>;
 }, {
     lang: import("vue").ComputedRef<UploadLocale>;
@@ -43,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
     onItemClick: (item: UploadItem) => void;
     onItemRetry: (item: UploadItem) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    'update:modelValue': (_value: UploadItem[]) => boolean; /** 当前为第几个图片 */
+    'update:modelValue': (_value: UploadItem[]) => boolean;
     itemClick: (_item: UploadItem) => boolean;
     upload: (_item: UploadItem) => boolean;
     remove: (_item: UploadItem) => boolean;
@@ -72,7 +76,10 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<boolean | Record<string | number | symbol, any>>;
         default: boolean;
     };
+    imageProps: import("vue").PropType<import("../ele-app/el").ElImageProps>;
     progressProps: import("vue").PropType<import("../ele-app/el").ElProgressProps>;
+    previewProps: import("vue").PropType<import("../ele-app/el").ElImageProps>;
+    /** 当前图片地址 */
     locale: import("vue").PropType<Partial<UploadLocale>>;
 }>> & {
     "onUpdate:modelValue"?: ((_value: UploadItem[]) => any) | undefined;
@@ -84,9 +91,9 @@ declare const _default: import("vue").DefineComponent<{
     disabled: boolean;
     readonly: boolean;
     sortable: boolean | Record<string | number | symbol, any>;
+    multiple: boolean;
     preview: boolean;
     drag: boolean;
-    multiple: boolean;
     accept: string;
 }, {}>;
 export default _default;

package/lib/ele-upload-list/props.cjs

@@ -35,8 +35,12 @@ const uploadListProps = {
     type: [Boolean, Object],
     default: true
   },
-  /** 进度条属性 */
+  /** 自定义图片属性 */
+  imageProps: Object,
+  /** 自定义进度条属性 */
   progressProps: Object,
+  /** 自定义图片预览 */
+  previewProps: Object,
   /** 国际化 */
   locale: Object
 };

package/lib/ele-upload-list/props.d.ts

@@ -1,6 +1,7 @@
-import type { PropType, ExtractPropTypes } from 'vue';
-import type { ElProgressProps } from '../ele-app/el';
-import type { UploadItem, UploadLocale } from './types';
+import { UploadItem, UploadLocale } from './types';
+import { ElProgressProps, ElImageProps } from '../ele-app/el';
+import { PropType, ExtractPropTypes } from 'vue';
+
 /**
  * 属性
  */
@@ -31,16 +32,20 @@ export declare const uploadListProps: {
         default: string;
     };
     /** 自定义条目样式 */
-    itemStyle: PropType<Partial<import("vue").CSSProperties>>;
+    itemStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 自定义上传按钮样式 */
-    buttonStyle: PropType<Partial<import("vue").CSSProperties>>;
+    buttonStyle: PropType<Partial<import('vue').CSSProperties>>;
     /** 是否开启拖拽排序 */
     sortable: {
         type: PropType<boolean | Record<string | number | symbol, any>>;
         default: boolean;
     };
-    /** 进度条属性 */
+    /** 自定义图片属性 */
+    imageProps: PropType<ElImageProps>;
+    /** 自定义进度条属性 */
     progressProps: PropType<ElProgressProps>;
+    /** 自定义图片预览 */
+    previewProps: PropType<ElImageProps>;
     /** 国际化 */
     locale: PropType<Partial<UploadLocale>>;
 };

package/lib/ele-upload-list/style/index.scss

@@ -163,7 +163,8 @@
 
     .ele-upload-icon {
       font-size: 22px;
-      color: elVar('text-color', 'placeholder');
+      color: elVar('text-color', 'secondary');
+      opacity: 0.68;
 
       & > svg {
         stroke-width: 3.8;

package/lib/ele-virtual-table/components/body-cell.cjs

@@ -15,18 +15,31 @@ const _sfc_main = vue.defineComponent({
     CellRender: util.CellRender
   },
   props: {
-    /** 当前列配置 */
-    column: Object,
-    /** 当前列索引 */
-    columnIndex: Number,
-    /** 当前行索引 */
-    rowIndex: Number,
-    /** 当前行数据 */
-    rowData: Object,
-    /** 表格主体列宽 */
-    colSizes: Array,
-    /** 表格尺寸 */
-    tableSize: String,
+    /** 列配置 */
+    column: {
+      type: Object,
+      required: true
+    },
+    /** 列索引 */
+    columnIndex: {
+      type: Number,
+      required: true
+    },
+    /** 行索引 */
+    rowIndex: {
+      type: Number,
+      required: true
+    },
+    /** 行数据 */
+    rowData: {
+      type: Object,
+      required: true
+    },
+    /** 所有列的列宽 */
+    colSizes: {
+      type: Array,
+      required: true
+    },
     /** 单元格类名自定义 */
     bodyCellClass: [String, Function],
     /** 单元格样式自定义 */
@@ -39,13 +52,17 @@ const _sfc_main = vue.defineComponent({
     pageIndex: Number,
     /** 表格行高 */
     rowHeight: Number,
-    /** 树表格展开图标的列 */
-    expandColumnKey: String,
     /** 多选当前行是否选中 */
     isChecked: Boolean,
+    /** 多选当前行是否禁用 */
+    isDisabled: Boolean,
+    /** 表格尺寸 */
+    tableSize: String,
+    /** 树表格展开图标的列 */
+    expandColumnKey: String,
     /** 树表格当前行是否有子级 */
     hasChildren: Boolean,
-    /** 当前行缩进 */
+    /** 树表格当前行缩进 */
     rowIndent: String,
     /** 树表格当前行是否折叠 */
     isCollapse: Boolean,
@@ -58,27 +75,23 @@ const _sfc_main = vue.defineComponent({
   },
   emits: {
     /** 多选框选中改变事件 */
-    checkedChange: (_row, _checked) => true,
+    checkedChange: (_checked) => true,
     /** 展开状态改变事件 */
-    expandChange: (_row, _expanded) => true,
+    expandChange: (_expanded) => true,
     /** 点击事件 */
-    click: (_row, _col, _e) => true,
+    click: (_col, _e) => true,
     /** 双击事件 */
-    dblclick: (_row, _col, _e) => true,
+    dblclick: (_col, _e) => true,
     /** 右键事件 */
-    contextmenu: (_row, _col, _e) => true,
+    contextmenu: (_col, _e) => true,
     /** 鼠标移入事件 */
-    mouseenter: (_row, _col, _e) => true,
+    mouseenter: (_col, _e) => true,
     /** 鼠标移出事件 */
-    mouseleave: (_row, _col, _e) => true
+    mouseleave: (_col, _e) => true
   },
   setup(props, { emit, slots }) {
-    const originalCol = vue.computed(() => {
-      return props.column ? props.column.originalCol : void 0;
-    });
-    const colType = vue.computed(() => {
-      return originalCol.value ? originalCol.value.type : void 0;
-    });
+    const originalCol = vue.computed(() => props.column.originalCol);
+    const colType = vue.computed(() => originalCol.value.type ?? "");
     const cellParam = vue.computed(() => {
       return {
         column: originalCol.value,
@@ -88,29 +101,8 @@ const _sfc_main = vue.defineComponent({
       };
     });
     const cellSpan = vue.computed(() => {
-      const span = { rowspan: 1, colspan: 1 };
-      if (typeof props.spanMethod === "function") {
-        const result = props.spanMethod(cellParam.value);
-        if (result != null) {
-          if (Array.isArray(result)) {
-            const [rowspan, colspan] = result;
-            if (rowspan != null) {
-              span.rowspan = rowspan;
-            }
-            if (colspan != null) {
-              span.colspan = colspan;
-            }
-          } else {
-            if (result.rowspan != null) {
-              span.rowspan = result.rowspan;
-            }
-            if (result.colspan != null) {
-              span.colspan = result.colspan;
-            }
-          }
-        }
-      }
-      if (colType.value && ["indedx", "selection", "expand"].includes(colType.value)) {
+      const span = util.getCellSpan(cellParam.value, props.spanMethod);
+      if (["indedx", "selection", "expand"].includes(colType.value)) {
         span.rowspan = 1;
       }
       return span;
@@ -182,14 +174,11 @@ const _sfc_main = vue.defineComponent({
       return classes.join(" ");
     });
     const cellWidth = vue.computed(() => {
-      if (props.columnIndex == null || !props.colSizes) {
-        return;
-      }
-      let width = props.colSizes[props.columnIndex].width || 0;
       const colspan = cellSpan.value.colspan;
       if (colspan === 0) {
         return "0px";
       }
+      let width = props.colSizes[props.columnIndex].width || 0;
       if (colspan && colspan > 1) {
         const end = props.columnIndex + colspan;
         for (let i = props.columnIndex; i < end; i++) {
@@ -237,6 +226,13 @@ const _sfc_main = vue.defineComponent({
       ];
     });
     const cellText = vue.computed(() => {
+      const col = originalCol.value;
+      if (col && col.type === "index") {
+        if (typeof col.index === "function") {
+          return;
+        }
+        return util.getIndexValue(props.rowIndex, col.index, props.pageIndex);
+      }
       const prop = props.column ? props.column.dataKey : void 0;
       const { rowspan, colspan } = cellSpan.value;
       if (rowspan === 0 || colspan === 0 || prop == null || !props.rowData) {
@@ -244,12 +240,6 @@ const _sfc_main = vue.defineComponent({
       }
       return util$1.getValue(props.rowData, prop);
     });
-    const indexText = vue.computed(() => {
-      const rowIndex = props.rowIndex || 0;
-      const index = originalCol.value ? originalCol.value.index : void 0;
-      const start = typeof index === "function" ? index(rowIndex) : index;
-      return String((props.pageIndex || start || 0) + rowIndex);
-    });
     const isExpandCol = vue.computed(() => {
       return props.column != null && props.expandColumnKey != null && props.expandColumnKey === props.column.key;
     });
@@ -257,18 +247,23 @@ const _sfc_main = vue.defineComponent({
       const col = originalCol.value;
       const { rowspan, colspan } = cellSpan.value;
       if (col && rowspan !== 0 && colspan !== 0) {
+        const { rowIndex, rowData } = props;
+        if (col.type === "index") {
+          if (typeof col.index === "function") {
+            return { render: col.index, params: [rowIndex] };
+          }
+          return {};
+        }
         if (col.slot && typeof slots[col.slot] === "function") {
-          const param = {
-            row: props.rowData,
-            column: col,
-            $index: props.rowIndex
+          return {
+            render: slots[col.slot],
+            params: [{ row: rowData, column: col, $index: rowIndex }]
           };
-          return { render: slots[col.slot], params: [param] };
         }
         if (typeof col.formatter === "function") {
           return {
             render: col.formatter,
-            params: [props.rowData, col, cellText.value, props.rowIndex]
+            params: [rowData, col, cellText.value, rowIndex]
           };
         }
       }
@@ -280,58 +275,32 @@ const _sfc_main = vue.defineComponent({
       }
     };
     const onCheckedChange = (checked) => {
-      emit("checkedChange", props.rowData, checked);
+      emit("checkedChange", checked);
     };
     const onExpandChange = () => {
       if (!props.loading) {
-        emit("expandChange", props.rowData, props.isCollapse);
+        emit("expandChange", props.isCollapse);
       }
     };
     const onClick = (e) => {
-      emit(
-        "click",
-        props.rowData,
-        originalCol.value,
-        e
-      );
+      emit("click", originalCol.value, e);
     };
     const onDblclick = (e) => {
-      emit(
-        "dblclick",
-        props.rowData,
-        originalCol.value,
-        e
-      );
+      emit("dblclick", originalCol.value, e);
     };
     const onContextmenu = (e) => {
-      emit(
-        "contextmenu",
-        props.rowData,
-        originalCol.value,
-        e
-      );
+      emit("contextmenu", originalCol.value, e);
     };
     const onMouseenter = (e) => {
-      emit(
-        "mouseenter",
-        props.rowData,
-        originalCol.value,
-        e
-      );
+      emit("mouseenter", originalCol.value, e);
     };
     const onMouseleave = (e) => {
-      emit(
-        "mouseleave",
-        props.rowData,
-        originalCol.value,
-        e
-      );
+      emit("mouseleave", originalCol.value, e);
     };
     return {
       colType,
       cellClass,
       cellStyle,
-      indexText,
       cellText,
       isExpandCol,
       renderOpt,
@@ -361,8 +330,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_LoadingDotOutlined = vue.resolveComponent("LoadingDotOutlined");
   const _component_ArrowDown = vue.resolveComponent("ArrowDown");
   const _component_ElIcon = vue.resolveComponent("ElIcon");
-  const _component_CellRender = vue.resolveComponent("CellRender");
   const _component_CellCheckbox = vue.resolveComponent("CellCheckbox");
+  const _component_CellRender = vue.resolveComponent("CellRender");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: vue.normalizeClass(_ctx.cellClass),
     style: vue.normalizeStyle(_ctx.cellStyle),
@@ -397,20 +366,18 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, 8, ["class"])
         ], 2)) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_1))
       ], 64)) : vue.createCommentVNode("", true),
-      !_ctx.colType ? (vue.openBlock(), vue.createBlock(_component_CellRender, vue.normalizeProps(vue.mergeProps({ key: 1 }, _ctx.renderOpt)), {
+      _ctx.colType === "selection" ? (vue.openBlock(), vue.createBlock(_component_CellCheckbox, {
+        key: 1,
+        checked: _ctx.isChecked,
+        disabled: _ctx.isDisabled,
+        size: _ctx.tableSize,
+        onChange: _ctx.onCheckedChange
+      }, null, 8, ["checked", "disabled", "size", "onChange"])) : _ctx.colType !== "expand" ? (vue.openBlock(), vue.createBlock(_component_CellRender, vue.normalizeProps(vue.mergeProps({ key: 2 }, _ctx.renderOpt)), {
         default: vue.withCtx(() => [
           vue.createTextVNode(vue.toDisplayString(_ctx.cellText), 1)
         ]),
         _: 1
-      }, 16)) : _ctx.colType === "index" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
-        vue.createTextVNode(vue.toDisplayString(_ctx.indexText), 1)
-      ], 64)) : _ctx.colType === "selection" ? (vue.openBlock(), vue.createBlock(_component_CellCheckbox, {
-        key: 3,
-        checked: _ctx.isChecked,
-        disabled: _ctx.rowData ? _ctx.rowData._rowDisabled : false,
-        size: _ctx.tableSize,
-        onChange: _ctx.onCheckedChange
-      }, null, 8, ["checked", "disabled", "size", "onChange"])) : vue.createCommentVNode("", true)
+      }, 16)) : vue.createCommentVNode("", true)
     ])
   ], 38);
 }