From 38b3548433f54e9e13583f7c51d8512b0a9021cf Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 22 九月 2023 08:59:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   45 ++++++++++++++++++---------------------------
 1 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index cd0af83..3e341d5 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -129,7 +129,7 @@
   },
   created() {
 
-    },
+  },
   computed: {
     localTrendsSpan() {
       if (this.trendsSpan) {
@@ -154,7 +154,6 @@
       handler(newval,oldval){
         if(newval){
           this.TreeValueForm=newval;
-          // console.log(this.TreeValueForm)
         }
       },
       deep:true,
@@ -167,23 +166,18 @@
       if (this.eventList) {
         this.eventFlag= this.eventList.some(item => {
           if (item.classifyInvokeEditFlag === 'true') {
-            // console.log('even', item);
             this.eventObject = item;
             return true;
           }
         });
-        // console.log('add',add)
       }
       // 鏃犻渶鍒嗙粍鏁版嵁
       let column = [];
       let group = [];
       let dictKeys = [];
       let slotColumnList = [];
-      let value=''
       formItemList.forEach((formItem) => {
         formItem = this.resetFormConfig(formItem);
-        // console.log(formItem)
-        // console.log('formItem.dicData.value',formItem.dicData)
         if (formItem.type === "line") {
           group.push({
             label: formItem.text,
@@ -252,19 +246,19 @@
           referConfig:
             formItem.type == "refer"
               ? {
-                  title: formItem.text,
-                  showField: formItem.showField || formItem.field,
-                  field: formItem.field,
-                  fieldMap:formItem.fieldMap || {fieldMapKey:'id'},
-                  placeholder: formItem.inputTip,
-                  options: formItem.referConfig
-                }
+                title: formItem.text,
+                showField: formItem.showField || formItem.field,
+                field: formItem.field,
+                fieldMap:formItem.fieldMap || {fieldMapKey:'id'},
+                placeholder: formItem.inputTip,
+                options: formItem.referConfig
+              }
               : {},
           span: formItem.span
             ? formItem.span
             : formItem.type === "textarea"
-            ? 24
-            : this.localTrendsSpan,
+              ? 24
+              : this.localTrendsSpan,
           rules: [
             {
               required: formItem.required,
@@ -283,9 +277,7 @@
             value: "key",
           },
         };
-        // console.log('columnItem',columnItem)
         slotColumnList.push(columnItem);
-        // console.log('slotColumnList',slotColumnList)
         if (group.length === 0) {
           column.push(columnItem);
         } else {
@@ -307,7 +299,6 @@
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {
-      // console.log(this.selfColumnConfig)
       for (const configType in this.selfColumnConfig) {
         if (Object.hasOwnProperty.call(this.selfColumnConfig, configType)) {
           const element = this.selfColumnConfig[configType];
@@ -323,9 +314,6 @@
               if (Object.hasOwnProperty.call(element, newAttr)) {
                 const oldAttr = element[newAttr];
                 formItem[newAttr] = formItem[oldAttr];
-                // console.log(formItem)
-                // console.log(newAttr,oldAttr)
-                // console.log(formItem[newAttr],formItem[oldAttr])
               }
             }
           } else if (configType === "directVoluation") {
@@ -416,7 +404,7 @@
       );
     },
     setReferValue(data) {
-      // console.log(data)
+      debugger;
       if (data.field) {
         this.form[data.field] = data.value || "";
         this.form[data.showField] = data.text || "";
@@ -430,21 +418,24 @@
               if (!_item.attributes) {
                 _item.attributes = _item;
               }
+              if (!_item.attributes.data) {
+                _item.attributes.data = {};
+              }
               if (mapFields.length == 1) {
                 var mapField = mapFields[0];
                 if (mapField.indexOf("attribute.") > -1) {
-                  temp = _item['attributes'][mapField.subString("attribute.".length)];
+                  temp = _item['attributes'][mapField.subString("attribute.".length)] || _item['attributes']['data'][mapField.subString("attribute.".length)];
                 } else {
-                  temp = _item['attributes'][mapField] || _item[mapField];
+                  temp = _item['attributes'][mapField] ||_item['attributes']['data'][mapField] || _item[mapField];
                 }
               } else {
                 //鏈夊涓�
                 var mutiTemp = [];
                 layui.each(mapFields, function (_indexField, _itemField) {
                   if (_itemField.indexOf("attribute.") > -1) {
-                    mutiTemp.push(_item['attributes'][_itemField.subString("attribute.".length)]);
+                    mutiTemp.push(_item['attributes'][_itemField.subString("attribute.".length)] || _item['attributes']['data'][_itemField.subString("attribute.".length)]);
                   } else {
-                    mutiTemp.push(_item['attributes'][_itemField] || _item[_itemField]);
+                    mutiTemp.push(_item['attributes'][_itemField] || _item['attributes']['data'][_itemField] || _item[_itemField]);
                   }
                 });
                 temp = mutiTemp.join(' ');

--
Gitblit v1.9.3