From 7cfa2ce9e0810ff64b15c81d716b1b30d5690eb0 Mon Sep 17 00:00:00 2001 From: Oliver <1069035666@qq.com> Date: Thu, 3 Mar 2022 11:32:42 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=83=BD=E9=87=8D=E6=96=B0=20=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/components/JeeSiteSelect.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Form/src/components/JeeSiteSelect.vue b/src/components/Form/src/components/JeeSiteSelect.vue index 5b690a8..c144ceb 100644 --- a/src/components/Form/src/components/JeeSiteSelect.vue +++ b/src/components/Form/src/components/JeeSiteSelect.vue @@ -62,6 +62,7 @@ }, resultField: propTypes.string.def(''), immediate: propTypes.bool.def(false), + each: propTypes.bool.def(false), dictType: propTypes.string, mode: propTypes.string, }, @@ -145,6 +146,8 @@ if (!props.immediate && !unref(isFirstLoad)) { await fetch(); isFirstLoad.value = true; + } else if (props.each) { + await fetch(); } emit('click'); } -- Gitee From 9a82572d7d18c20eab602fc2df4736dc846188af Mon Sep 17 00:00:00 2001 From: Oliver <1069035666@qq.com> Date: Sun, 6 Mar 2022 01:54:47 +0000 Subject: [PATCH 2/4] =?UTF-8?q?TreeSelect=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/components/JeeSiteTreeSelect.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/Form/src/components/JeeSiteTreeSelect.vue b/src/components/Form/src/components/JeeSiteTreeSelect.vue index 778972d..5779f9c 100644 --- a/src/components/Form/src/components/JeeSiteTreeSelect.vue +++ b/src/components/Form/src/components/JeeSiteTreeSelect.vue @@ -62,6 +62,10 @@ type: Object as PropType, default: () => ({}), }, + isDisable: { + type: Function as PropType<(node: Recordable) => boolean>, + default: null, + }, resultField: propTypes.string.def(''), immediate: propTypes.bool.def(false), dictType: propTypes.string, @@ -157,7 +161,10 @@ function getTreeData(treeData: Recordable[]) { if (props.treeDataSimpleMode) { return listToTree(treeData, { - callback: (parent) => { + callback: (parent, node) => { + if (props.isDisable && node) { + node.disabled = props.isDisable(node); + } if (!props.canSelectParent && parent) { if (parent.children && parent.children.length > 0) { parent.disabled = true; -- Gitee From 002db05e35454dffef46b6a8ff5f059a6dfd3137 Mon Sep 17 00:00:00 2001 From: Oliver <1069035666@qq.com> Date: Mon, 7 Mar 2022 03:08:21 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B9=9F=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?Format=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/components/editable/EditableCell.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue index d54f230..44cbbc4 100644 --- a/src/components/Table/src/components/editable/EditableCell.vue +++ b/src/components/Table/src/components/editable/EditableCell.vue @@ -44,6 +44,7 @@ import { useDesign } from '/@/hooks/web/useDesign'; import { useTableContext } from '../../hooks/useTableContext'; + import { formatCell } from '../../hooks/useColumns'; import clickOutside from '/@/directives/clickOutside'; @@ -141,6 +142,9 @@ if (props.column?.dataLabel && labelValue) { return labelValue; } + if (props.column?.format && value) { + return formatCell(value, props.column.format, props.record as Recordable, props.index); + } return value; }); -- Gitee From 90b22bc59a2ce1f9ae478e5c5d8fb12f4b153319 Mon Sep 17 00:00:00 2001 From: Oliver <1069035666@qq.com> Date: Mon, 7 Mar 2022 09:34:14 +0000 Subject: [PATCH 4/4] =?UTF-8?q?CellFormat=20=E9=80=82=E5=BA=94=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/types/table.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts index 502095e..a564cb0 100644 --- a/src/components/Table/src/types/table.ts +++ b/src/components/Table/src/types/table.ts @@ -412,7 +412,7 @@ export interface BasicTableProps { export type CellFormat = | string - | ((text: string, record: Recordable, index: number) => string | number) + | ((text: any, record: Recordable, index: number) => string | number) | Map; // @ts-ignore -- Gitee