ele-admin-plus 1.2.2-beta.4 → 1.2.2-beta.5

package/es/ele-check-card/index.d.ts

@@ -20,6 +20,7 @@ declare const _default: import('vue').DefineComponent<{
     itemClass: StringConstructor;
     itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
+    allowUncheck: BooleanConstructor;
 }, {
     isChecked: (item: CheckCardItem) => boolean;
     handleItemClick: (item: CheckCardItem) => void;
@@ -46,6 +47,7 @@ declare const _default: import('vue').DefineComponent<{
     itemClass: StringConstructor;
     itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
+    allowUncheck: BooleanConstructor;
 }>> & {
     "onUpdate:modelValue"?: ((_value: CheckedValue) => any) | undefined;
     onChange?: ((_value: CheckedValue) => any) | undefined;
@@ -55,5 +57,6 @@ declare const _default: import('vue').DefineComponent<{
     bordered: boolean;
     arrow: boolean;
     multiple: boolean;
+    allowUncheck: boolean;
 }, {}>;
 export default _default;

package/es/ele-check-card/index.js

@@ -1,6 +1,6 @@
 import { defineComponent, resolveComponent, openBlock, createElementBlock, createBlock, normalizeProps, mergeProps, withCtx, Fragment, renderList, createVNode, normalizeStyle, normalizeClass, renderSlot, createTextVNode, toDisplayString } from "vue";
 import { ElRow, ElCol } from "element-plus";
-import { useFormValidate, valueIsChanged } from "../ele-basic-select/util";
+import { useFormValidate, isEmptyValue, valueIsChanged } from "../ele-basic-select/util";
 import CardItem from "./components/card-item";
 import { checkCardProps, checkCardEmits } from "./props";
 const _sfc_main = defineComponent({
@@ -34,6 +34,10 @@ const _sfc_main = defineComponent({
         return;
       }
       if (!props.multiple) {
+        if (props.allowUncheck && !isEmptyValue(props.modelValue) && props.modelValue === item.value) {
+          updateModelValue(null);
+          return;
+        }
         updateModelValue(item.value);
         return;
       }

package/es/ele-check-card/props.d.ts

@@ -36,6 +36,8 @@ export declare const checkCardProps: {
     itemStyle: PropType<StyleValue>;
     /** 是否使用栅格布局 */
     row: PropType<boolean | ElRowProps>;
+    /** 单选时允许取消选中 */
+    allowUncheck: BooleanConstructor;
 };
 export type CheckCardProps = ExtractPropTypes<typeof checkCardProps>;
 /**

package/es/ele-check-card/props.js

@@ -29,7 +29,9 @@ const checkCardProps = {
   /** 自定义卡片样式 */
   itemStyle: Object,
   /** 是否使用栅格布局 */
-  row: [Boolean, Object]
+  row: [Boolean, Object],
+  /** 单选时允许取消选中 */
+  allowUncheck: Boolean
 };
 const checkCardEmits = {
   /** 更新选中值 */

package/es/ele-pro-table/types.d.ts

@@ -322,7 +322,7 @@ export interface ExportDataItem {
   /** 列配置 */
   column?: Column;
   /** 文本 */
-  text?: string;
+  text?: string | number | boolean | Record<string, any> | Array<any>;
   /** 所占列数 */
   colspan?: number;
   /** 所占行数 */

package/es/ele-pro-table/util.d.ts

@@ -228,7 +228,7 @@ export declare function getRowKey(rowKey?: RowKey): string | ((row: DataItem) =>
  * @param index 行索引
  * @param pageIndex 序号列起始索引
  */
-export declare function getCellText(column: Column | undefined, row: DataItem, index: number, pageIndex?: number): string;
+export declare function getCellText(column: Column | undefined, row: DataItem, index: number, pageIndex?: number): string | number | boolean | Record<string, any> | Array<any>;
 /**
  * 导出获取表头单元格文本
  * @param column 列配置

package/es/ele-pro-table/util.js

@@ -496,7 +496,7 @@ function getCellText(column, row, index, pageIndex) {
   if (typeof column.formatter === "function") {
     return column.formatter(row, column, propValue, index);
   }
-  return propValue == null ? "" : String(propValue);
+  return propValue == null ? "" : propValue;
 }
 function getHeaderCellText(column, index) {
   if (!column) {
@@ -575,7 +575,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
         indent: node.level
       };
       if (column.type === "expand") {
-        dataItem.text = showExpandIndex ? String(node.index + 1) : "";
+        dataItem.text = showExpandIndex ? node.index + 1 : "";
         if (showExpandIndex && !expandRowData.length) {
           dataItem.rowspan = 2;
         }
@@ -614,7 +614,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
         bodyRowData.unshift({
           key: `_index_${index}-${i}`,
           index,
-          text: i === node.level ? String(node.index + 1) : void 0,
+          text: i === node.level ? node.index + 1 : void 0,
           colspan,
           rowspan: i === node.level ? node.childSize + 1 : colspan,
           isTreeIndex: true,

package/es/ele-virtual-table/components/body-cell.d.ts

@@ -65,7 +65,7 @@ declare const _default: import('vue').DefineComponent<{
     colType: import('vue').ComputedRef<string>;
     cellClass: import('vue').ComputedRef<string>;
     cellStyle: import('vue').ComputedRef<StyleValues | undefined>;
-    cellText: import('vue').ComputedRef<string | undefined>;
+    cellText: import('vue').ComputedRef<string | number | undefined>;
     isExpandCol: import('vue').ComputedRef<boolean>;
     renderOpt: import('vue').ComputedRef<CustomRenderProps>;
     handleTextClick: (e: MouseEvent) => void;

package/es/ele-virtual-table/components/header-row.js

@@ -46,7 +46,7 @@ const _sfc_main = defineComponent({
   },
   setup(props, { emit }) {
     const getKey = (column, columnIndex) => {
-      return props.headerIndex + "-" + (column.key ?? columnIndex);
+      return props.headerIndex + "-" + String(column.key ?? columnIndex);
     };
     const getFiltered = (column) => {
       return getColFiltered(column.originalCol, props.filtered);

package/es/ele-virtual-table/types.d.ts

@@ -223,7 +223,17 @@ export interface CellParams {
  */
 export interface CustomRenderProps {
   /** 自定义渲染方法 */
-  render?: (...params: any) => string | VNode | VNode[] | number | undefined;
+  render?: (
+    ...params: any
+  ) =>
+    | string
+    | VNode
+    | VNode[]
+    | number
+    | boolean
+    | Record<string, any>
+    | Array<any>
+    | undefined;
   /** 自定义渲染参数 */
   params?: Array<any>;
 }

package/es/ele-virtual-table/util.d.ts

@@ -125,9 +125,7 @@ export declare function isAutoRowHeight(hasExpandCol: boolean, bodyCols: BodyCol
  * @param props 属性
  * @param ctx SetupContext
  */
-export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | VNode<import('vue').RendererNode, import('vue').RendererElement, {
-    [key: string]: any;
-}>)[] | undefined;
+export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): any[] | undefined;
 /**
  * 获取表头点击后的排序值
  * @param current 当前排序值
@@ -176,7 +174,7 @@ export declare function getTreeProps(treeProps?: TreeProps): TreeTableProps;
  * @param index 自定义起始索引
  * @param pageIndex 表格分页起始索引
  */
-export declare function getIndexValue(rowIndex: number, index?: ColumnIndex, pageIndex?: number): string;
+export declare function getIndexValue(rowIndex: number, index?: ColumnIndex, pageIndex?: number): number;
 /**
  * 获取单元格的跨行和跨列
  * @param column 列配置

package/es/ele-virtual-table/util.js

@@ -415,12 +415,12 @@ function getTreeProps(treeProps) {
 }
 function getIndexValue(rowIndex, index, pageIndex) {
   if (index == null) {
-    return String((pageIndex ?? 1) + rowIndex);
+    return (pageIndex ?? 1) + rowIndex;
   }
   if (typeof index === "function") {
-    return String(index(rowIndex));
+    return index(rowIndex);
   }
-  return String(index + rowIndex);
+  return index + rowIndex;
 }
 function getCellSpan(params, spanMethod) {
   var _a;

package/lib/ele-check-card/index.cjs

@@ -35,6 +35,10 @@ const _sfc_main = vue.defineComponent({
         return;
       }
       if (!props2.multiple) {
+        if (props2.allowUncheck && !util.isEmptyValue(props2.modelValue) && props2.modelValue === item.value) {
+          updateModelValue(null);
+          return;
+        }
         updateModelValue(item.value);
         return;
       }

package/lib/ele-check-card/index.d.ts

@@ -20,6 +20,7 @@ declare const _default: import('vue').DefineComponent<{
     itemClass: StringConstructor;
     itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
+    allowUncheck: BooleanConstructor;
 }, {
     isChecked: (item: CheckCardItem) => boolean;
     handleItemClick: (item: CheckCardItem) => void;
@@ -46,6 +47,7 @@ declare const _default: import('vue').DefineComponent<{
     itemClass: StringConstructor;
     itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
+    allowUncheck: BooleanConstructor;
 }>> & {
     "onUpdate:modelValue"?: ((_value: CheckedValue) => any) | undefined;
     onChange?: ((_value: CheckedValue) => any) | undefined;
@@ -55,5 +57,6 @@ declare const _default: import('vue').DefineComponent<{
     bordered: boolean;
     arrow: boolean;
     multiple: boolean;
+    allowUncheck: boolean;
 }, {}>;
 export default _default;

package/lib/ele-check-card/props.cjs

@@ -31,7 +31,9 @@ const checkCardProps = {
   /** 自定义卡片样式 */
   itemStyle: Object,
   /** 是否使用栅格布局 */
-  row: [Boolean, Object]
+  row: [Boolean, Object],
+  /** 单选时允许取消选中 */
+  allowUncheck: Boolean
 };
 const checkCardEmits = {
   /** 更新选中值 */

package/lib/ele-check-card/props.d.ts

@@ -36,6 +36,8 @@ export declare const checkCardProps: {
     itemStyle: PropType<StyleValue>;
     /** 是否使用栅格布局 */
     row: PropType<boolean | ElRowProps>;
+    /** 单选时允许取消选中 */
+    allowUncheck: BooleanConstructor;
 };
 export type CheckCardProps = ExtractPropTypes<typeof checkCardProps>;
 /**

package/lib/ele-pro-table/types.d.ts

@@ -322,7 +322,7 @@ export interface ExportDataItem {
   /** 列配置 */
   column?: Column;
   /** 文本 */
-  text?: string;
+  text?: string | number | boolean | Record<string, any> | Array<any>;
   /** 所占列数 */
   colspan?: number;
   /** 所占行数 */

package/lib/ele-pro-table/util.cjs

@@ -498,7 +498,7 @@ function getCellText(column, row, index, pageIndex) {
   if (typeof column.formatter === "function") {
     return column.formatter(row, column, propValue, index);
   }
-  return propValue == null ? "" : String(propValue);
+  return propValue == null ? "" : propValue;
 }
 function getHeaderCellText(column, index) {
   if (!column) {
@@ -577,7 +577,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
         indent: node.level
       };
       if (column.type === "expand") {
-        dataItem.text = showExpandIndex ? String(node.index + 1) : "";
+        dataItem.text = showExpandIndex ? node.index + 1 : "";
         if (showExpandIndex && !expandRowData.length) {
           dataItem.rowspan = 2;
         }
@@ -616,7 +616,7 @@ function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumTex
         bodyRowData.unshift({
           key: `_index_${index}-${i}`,
           index,
-          text: i === node.level ? String(node.index + 1) : void 0,
+          text: i === node.level ? node.index + 1 : void 0,
           colspan,
           rowspan: i === node.level ? node.childSize + 1 : colspan,
           isTreeIndex: true,

package/lib/ele-pro-table/util.d.ts

@@ -228,7 +228,7 @@ export declare function getRowKey(rowKey?: RowKey): string | ((row: DataItem) =>
  * @param index 行索引
  * @param pageIndex 序号列起始索引
  */
-export declare function getCellText(column: Column | undefined, row: DataItem, index: number, pageIndex?: number): string;
+export declare function getCellText(column: Column | undefined, row: DataItem, index: number, pageIndex?: number): string | number | boolean | Record<string, any> | Array<any>;
 /**
  * 导出获取表头单元格文本
  * @param column 列配置

package/lib/ele-virtual-table/components/body-cell.d.ts

@@ -65,7 +65,7 @@ declare const _default: import('vue').DefineComponent<{
     colType: import('vue').ComputedRef<string>;
     cellClass: import('vue').ComputedRef<string>;
     cellStyle: import('vue').ComputedRef<StyleValues | undefined>;
-    cellText: import('vue').ComputedRef<string | undefined>;
+    cellText: import('vue').ComputedRef<string | number | undefined>;
     isExpandCol: import('vue').ComputedRef<boolean>;
     renderOpt: import('vue').ComputedRef<CustomRenderProps>;
     handleTextClick: (e: MouseEvent) => void;

package/lib/ele-virtual-table/components/header-row.cjs

@@ -47,7 +47,7 @@ const _sfc_main = vue.defineComponent({
   },
   setup(props, { emit }) {
     const getKey = (column, columnIndex) => {
-      return props.headerIndex + "-" + (column.key ?? columnIndex);
+      return props.headerIndex + "-" + String(column.key ?? columnIndex);
     };
     const getFiltered = (column) => {
       return util.getColFiltered(column.originalCol, props.filtered);

package/lib/ele-virtual-table/types.d.ts

@@ -223,7 +223,17 @@ export interface CellParams {
  */
 export interface CustomRenderProps {
   /** 自定义渲染方法 */
-  render?: (...params: any) => string | VNode | VNode[] | number | undefined;
+  render?: (
+    ...params: any
+  ) =>
+    | string
+    | VNode
+    | VNode[]
+    | number
+    | boolean
+    | Record<string, any>
+    | Array<any>
+    | undefined;
   /** 自定义渲染参数 */
   params?: Array<any>;
 }

package/lib/ele-virtual-table/util.cjs

@@ -417,12 +417,12 @@ function getTreeProps(treeProps) {
 }
 function getIndexValue(rowIndex, index, pageIndex) {
   if (index == null) {
-    return String((pageIndex ?? 1) + rowIndex);
+    return (pageIndex ?? 1) + rowIndex;
   }
   if (typeof index === "function") {
-    return String(index(rowIndex));
+    return index(rowIndex);
   }
-  return String(index + rowIndex);
+  return index + rowIndex;
 }
 function getCellSpan(params, spanMethod) {
   var _a;

package/lib/ele-virtual-table/util.d.ts

@@ -125,9 +125,7 @@ export declare function isAutoRowHeight(hasExpandCol: boolean, bodyCols: BodyCol
  * @param props 属性
  * @param ctx SetupContext
  */
-export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | VNode<import('vue').RendererNode, import('vue').RendererElement, {
-    [key: string]: any;
-}>)[] | undefined;
+export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): any[] | undefined;
 /**
  * 获取表头点击后的排序值
  * @param current 当前排序值
@@ -176,7 +174,7 @@ export declare function getTreeProps(treeProps?: TreeProps): TreeTableProps;
  * @param index 自定义起始索引
  * @param pageIndex 表格分页起始索引
  */
-export declare function getIndexValue(rowIndex: number, index?: ColumnIndex, pageIndex?: number): string;
+export declare function getIndexValue(rowIndex: number, index?: ColumnIndex, pageIndex?: number): number;
 /**
  * 获取单元格的跨行和跨列
  * @param column 列配置

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.2.2-beta.4",
+  "version": "1.2.2-beta.5",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",