diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 31088a9..faf4b6e 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',
@@ -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"
);
@@ -2555,6 +2560,31 @@ 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
+ }
+ 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
+
resDataNoTable = resDataNoTable.filter(
(item: { type: string | null }) => item.type != "table"
@@ -2574,11 +2604,16 @@ function getAssociatedFormsCurrentFieldTree1() {
treeAttrs: data.treeAttrs,
},
];
-
+ //console.log(resDataNoTable)
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(resDataHasTableButNoTableChild);
+ //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 end 250409
resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
associatedFormsCurrentFormFieldTreeForGlxxsz.value = [
@@ -2751,6 +2786,7 @@ function handleRoleTreeContextmenuRange(
}
import { ElTree } from "element-plus";
+import { forEach } from "jszip";
const fieldTreeFilterText = ref("");
const orgTreeFilterText = ref("");
@@ -3284,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
@@ -4127,6 +4165,17 @@ const updataBase = (val: any) => {
+
+
+ 默认图片
+ 已上传默认图片,点击修改
+
+
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[]) => {
/>
-
+
-
+