Merge branch 'lwx_v21'

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"
         );
@@ -2556,6 +2561,31 @@ function getAssociatedFormsCurrentFieldTree1() {
         },
       ];
       
+      //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];
-
+      //liwenxuan 关联选项设置无法识别创建人,创建时间控件bug修复 start 250409
-      let resDataForGlxxsz = ref(data.children.slice(8));
+      /* 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) => {
                   </el-input>
                 </div>
               </el-row>
+              <el-row v-else-if="item.type === 'lowcodeImage_url'">
+									<el-upload 
+									:action="uploadUrl"  :before-remove="beforeRemove"
+									:on-success="lowcodeImageUploadSuccess" 
+									:on-error="videoUploadErr"
+									:limit="1"
+									accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign">
+										<el-button v-if="!controlData.control.uploadFlag" type="primary">默认图片</el-button>
+										<el-button v-if="controlData.control.uploadFlag" type="primary">已上传默认图片,点击修改</el-button>
+									</el-upload>
+								</el-row>
               <!-- <el-row v-else-if="item.type === 'lowcodeImage_radius'">
 									<el-switch v-model="controlData.control.radius" style="margin-right: 15px;"/>
 									<el-popover
@@ -5795,7 +5844,7 @@ const updataBase = (val: any) => {
               @del-role="delRole"
               @child-role-right-changed="childRoleRightChanged"
             >
-            </AssociatedFormsFillRole>
+            </AssociatedFormsFillRole><!--  -->
           </template>
         </div>
       </div>

src/components/DesignForm/public/form/formItem.vue

@@ -1051,7 +1051,7 @@ const diGuiJilian = (val: any, options: any[]) => {
   />
   <!--关联表单-->
   <AssociatedForms
-    v-else-if="judgeIsShow(data.name) && data.type === 'associatedForms' && type != 4"
+    v-else-if="judgeIsShow(data.name) && data.type === 'associatedForms'"
     :data="data"
     :form-props="formProps"
     :tablekey="props.tablekey"

src/widget/associatedforms/associatedForms.vue

@@ -3,10 +3,10 @@
 
   <div class="container">
     <!-- <span style="font-size: 14px; margin-right: 12px;padding-top: 4px;" class="small-span" >{{ props.data.item?props.data.item.label:"关联表单" }}</span> -->
-    <el-select v-if="!tableFlag" v-model="value1"  placeholder="请选择" class="big-span" @change="asfValueChanged">
+    <el-select v-if="!tableFlag" v-model="value1"  :placeholder="data.config.help" class="big-span" @change="asfValueChanged">
       <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
-    <el-select v-if="tableFlag" v-model="value2"  placeholder="请选择" class="big-span" @change="asfValueChangedTable">
+    <el-select v-if="tableFlag" v-model="value2"  :placeholder="data.config.help" class="big-span" @change="asfValueChangedTable">
       <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
   </div>