From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   60 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 3ba7da9..3e341d5 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -26,6 +26,7 @@
       </template>
       <template :slot="item.prop + ''" v-for="item in slotColumnList">
         <vciWebRefer
+          :key="item.prop" :data-key="item.prop"
           v-if="item.type == 'refer'"
           :referConfig="item.referConfig || {}"
           :value="form[item.referConfig.field] || item.value"
@@ -89,9 +90,13 @@
       type: String,
       default: "",
     },
+    eventList:{
+      type:Array
+    }
   },
   data() {
     return {
+      eventFlag:{},
       TreeValueForm:'',
       updateIndex: 0,
       form: {},
@@ -119,8 +124,11 @@
       slotColumnList: [],
     };
   },
-    mounted() {
+  mounted() {
     this.handleResize();
+  },
+  created() {
+
   },
   computed: {
     localTrendsSpan() {
@@ -146,7 +154,6 @@
       handler(newval,oldval){
         if(newval){
           this.TreeValueForm=newval;
-          // console.log(this.TreeValueForm)
         }
       },
       deep:true,
@@ -156,15 +163,21 @@
   methods: {
     // 娓叉煋琛ㄥ崟妯℃澘
     templateRender(formItemList,TreeValue) {
+      if (this.eventList) {
+        this.eventFlag= this.eventList.some(item => {
+          if (item.classifyInvokeEditFlag === 'true') {
+            this.eventObject = item;
+            return true;
+          }
+        });
+      }
       // 鏃犻渶鍒嗙粍鏁版嵁
       let column = [];
       let group = [];
       let dictKeys = [];
       let slotColumnList = [];
-      let value=''
       formItemList.forEach((formItem) => {
         formItem = this.resetFormConfig(formItem);
-        // console.log('formItem.dicData.value',formItem.dicData)
         if (formItem.type === "line") {
           group.push({
             label: formItem.text,
@@ -221,7 +234,7 @@
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
-            (formItem.secType == "codedatesec"?formItem.codeDateFormatStr: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
+            (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null) ,
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
@@ -233,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,
@@ -264,9 +277,7 @@
             value: "key",
           },
         };
-        // console.log('columnItem',columnItem)
         slotColumnList.push(columnItem);
-        // console.log('slotColumnList',slotColumnList)
         if (group.length === 0) {
           column.push(columnItem);
         } else {
@@ -288,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];
@@ -304,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") {
@@ -397,7 +404,7 @@
       );
     },
     setReferValue(data) {
-      // console.log(data)
+      debugger;
       if (data.field) {
         this.form[data.field] = data.value || "";
         this.form[data.showField] = data.text || "";
@@ -411,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