diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 83402d9..2bc21bb 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -1165,7 +1165,8 @@ function dateStringToTimestampLocal(dateStr: string) { const isoStr = dateStr.replace(' ', 'T'); const timestamp = new Date(isoStr).getTime(); if (isNaN(timestamp)) { - throw new Error('Invalid date string'); + //throw new Error('Invalid date string'); + return '' } return String(timestamp); } diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts index 8d00709..43e56a0 100644 --- a/src/components/DesignForm/assembly/index.ts +++ b/src/components/DesignForm/assembly/index.ts @@ -687,7 +687,8 @@ export default [ }, tableData: [], // 子表表格列表数据集合 control: { - border: true + border: true, + defaultOne: '' }, config: { addBtnText: '添加一行' diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 3d25246..2320cf8 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -823,6 +823,14 @@ const attrList = computed(() => { vIf: state.isSearch, vShow: ["orgCentent"], }, + { + label: "默认一行", + value: config.table, + path: "config.table", + type: "table_defaultOne", + vIf: state.isSearch, + vShow: ["table"], + }, { label: "数据范围", value: config.expandUser, @@ -4734,8 +4742,18 @@ const formatTooltip = (val: number) => { + + + + + + + + + + 可选用户设置 diff --git a/src/components/DesignForm/public/expand/rangedUserTree.vue b/src/components/DesignForm/public/expand/rangedUserTree.vue index 8b5ffd3..1b5e4bf 100644 --- a/src/components/DesignForm/public/expand/rangedUserTree.vue +++ b/src/components/DesignForm/public/expand/rangedUserTree.vue @@ -105,7 +105,7 @@ function checkorgAndManTree1() { if (i == props.orgAndManTree.length) { props.orgAndManTree.forEach((item: any) => { if (props.data.name == item.name) { - console.log(item.tree) + //console.log(item.tree) result = item.tree } }); diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue index 185ea33..abd0e2c 100644 --- a/src/components/DesignForm/public/form/childTable.vue +++ b/src/components/DesignForm/public/form/childTable.vue @@ -5,7 +5,7 @@ -->