From 4817a9e538201811517d5d48c04cb43e282ef002 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Tue, 1 Apr 2025 11:25:36 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8D=95=E6=9D=A1=E8=AF=A6=E6=83=85=E6=97=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/public/form/formItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue index 253d7b5..8d3bf62 100644 --- a/src/components/DesignForm/public/form/formItem.vue +++ b/src/components/DesignForm/public/form/formItem.vue @@ -1051,7 +1051,7 @@ const diGuiJilian = (val: any, options: any[]) => { /> Date: Wed, 2 Apr 2025 08:59:28 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=88=9B=E5=BB=BA=E4=BA=BA=EF=BC=8C=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/formControlPropertiNew.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 31088a9..a768cbc 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2356,7 +2356,12 @@ function formidChanged() { (obj: { type: string }) => obj.type !== "table" ); //console.log(dataExceptChild) - dataExceptChild = removeFirstNumElements(dataExceptChild, 8); + //dataExceptChild = removeFirstNumElements(dataExceptChild, 8); + + dataExceptChild.splice(0, 2); + + dataExceptChild.splice(2, 4); + dataOnlyChild = dataOnlyChild.filter( (obj: { type: string }) => obj.type == "table" ); @@ -5795,7 +5800,7 @@ const updataBase = (val: any) => { @del-role="delRole" @child-role-right-changed="childRoleRightChanged" > - + From c10290eb3a924983b3bf42d423b8de0b6984be72 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 2 Apr 2025 09:26:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignForm/formControlPropertiNew.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index a768cbc..770db3e 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -804,15 +804,15 @@ const attrList = computed(() => { vIf: state.isSearch, vShow: ["videoUpAndPlay"], }, - /* { - label: '上传图片', + { + label: '默认图片', value: config.lowcodeImage, path: 'config.lowcodeImage', type: 'lowcodeImage_url', vIf: state.isSearch, vShow: ['lowcodeImage'] }, - { + /*{ label: '尺寸', value: config.lowcodeImage, path: 'config.lowcodeImage', @@ -4132,6 +4132,17 @@ const updataBase = (val: any) => { + + + 默认图片 + 已上传默认图片,点击修改 + + - + - + From d73d3227fe51940fcdbc482f1064dea72d5258aa Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 9 Apr 2025 10:20:20 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=AB=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA,=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/formControlPropertiNew.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 770db3e..b6f505c 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2581,9 +2581,13 @@ function getAssociatedFormsCurrentFieldTree1() { ]; associatedFormsCurrentFormFieldTreeNoTable1.value = [...resDataNoTable]; - - let resDataForGlxxsz = ref(data.children.slice(8)); - + //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 start 250409 + let r1 = JSON.parse(JSON.stringify(data.children)); + r1.splice(0,2); + r1.splice(2,4); + //let resDataForGlxxsz = ref(data.children.slice(8)); + let resDataForGlxxsz = ref(r1); + //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 end 250409 resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value)); associatedFormsCurrentFormFieldTreeForGlxxsz.value = [ From c359d8d2f2e3282cd7582466b0b65266c4b83ceb Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 9 Apr 2025 14:17:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AF=B9=E5=AD=90=E8=A1=A8=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88=E7=9A=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignForm/formControlPropertiNew.vue | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index b6f505c..f9a7aa1 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2560,6 +2560,19 @@ function getAssociatedFormsCurrentFieldTree1() { disabled: true, }, ]; + + //liwenxuan 关联选项设置对子表不生效的bug修复 start 250409 + let resDataHasTableButNoTableChild = JSON.parse(JSON.stringify(data.children)); + resDataHasTableButNoTableChild.splice(0,2); + resDataHasTableButNoTableChild.splice(2,4); + resDataHasTableButNoTableChild.forEach((element: any) => { + if(element.type&&element.type=="table"){ + element.children = [] + element.disabled = false + } + }); + //liwenxuan 关联选项设置对子表不生效的bug修复 end 250409 + resDataNoTable = resDataNoTable.filter( (item: { type: string | null }) => item.type != "table" @@ -2579,14 +2592,15 @@ function getAssociatedFormsCurrentFieldTree1() { treeAttrs: data.treeAttrs, }, ]; - + //console.log(resDataNoTable) associatedFormsCurrentFormFieldTreeNoTable1.value = [...resDataNoTable]; //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 start 250409 - let r1 = JSON.parse(JSON.stringify(data.children)); + /* let r1 = JSON.parse(JSON.stringify(data.children)); + r1.splice(0,2); - r1.splice(2,4); + r1.splice(2,4); */ //let resDataForGlxxsz = ref(data.children.slice(8)); - let resDataForGlxxsz = ref(r1); + let resDataForGlxxsz = ref(resDataHasTableButNoTableChild); //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 end 250409 resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value)); @@ -2760,6 +2774,7 @@ function handleRoleTreeContextmenuRange( } import { ElTree } from "element-plus"; +import { forEach } from "jszip"; const fieldTreeFilterText = ref(""); const orgTreeFilterText = ref(""); From 1ce52bcd68219106e81399e1c4009299f5c62bd3 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 9 Apr 2025 15:18:47 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=85=B3?= =?UTF-8?q?=E8=81=94=E9=80=89=E9=A1=B9=E8=AE=BE=E7=BD=AE=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=9C=AC=E4=BD=93=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignForm/formControlPropertiNew.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index f9a7aa1..faf4b6e 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2570,7 +2570,19 @@ function getAssociatedFormsCurrentFieldTree1() { element.children = [] element.disabled = false } + let currentIdArr = element.id.split(":") + //console.log(currentIdArr) + let currentId = currentIdArr[currentIdArr.length-1] + //console.log(currentId) + + if(currentId==controlData.value.name){ + /* alert(currentId) + console.log(currentId) */ + element.disabled = true + } }); + + //liwenxuan 关联选项设置对子表不生效的bug修复 end 250409 @@ -3308,6 +3320,8 @@ watch( ) ); } else { + console.log(changedOptions) + console.log(controlData.value.control.glxxsz) for (var i = 0; i < changedOptions.length; i++) { if (controlData.value.control.glxxsz[i] === undefined) { //新增了某个option