From 286985f09443f53c1ecbb0e6093dad09b5c65897 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 11 十月 2021 18:11:18 +0800
Subject: [PATCH] 2021-10-11

---
 src/utils/utils-custom.js |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 621c33c..a5f307f 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -16,10 +16,12 @@
         }
       } else if (item.type === 'tabs') {
         let _item = {
+          type: 'tabs',
           value: item.uuid,
           label: item.name,
           children: item.subtabs.map(f_tab => {
             let subItem = {
+              type: 'tab',
               value: f_tab.uuid,
               label: f_tab.label,
               children: this.getSubModules(f_tab.components, selfId)
@@ -272,8 +274,8 @@
           uuids.push(act.uuid)
         })
 
-        if (card.type === 'card' || item.type === 'carousel' || (card.type === 'table' && card.subtype === 'tablecard')) {
-          card.subcards.forEach(_card => {
+        if (item.type === 'card' || item.type === 'carousel' || (item.type === 'table' && item.subtype === 'tablecard')) {
+          item.subcards.forEach(_card => {
             _card.elements && _card.elements.forEach(cell => {
               if (cell.eleType !== 'button') return
               if (appType === 'pc' && cell.OpenType !== 'popview') return
@@ -287,8 +289,8 @@
               uuids.push(cell.uuid)
             })
           })
-        } else if (card.type === 'table' && card.subtype === 'normaltable') {
-          card.cols && card.cols.forEach(col => {
+        } else if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable')) {
+          item.cols && item.cols.forEach(col => {
             if (col.type !== 'action') return
             col.elements && col.elements.forEach(cell => {
               if (appType === 'pc' && cell.OpenType !== 'popview') return
@@ -296,8 +298,8 @@
               uuids.push(cell.uuid)
             })
           })
-        } else if (card.type === 'balcony') {
-          card.elements && card.elements.forEach(cell => {
+        } else if (item.type === 'balcony') {
+          item.elements && item.elements.forEach(cell => {
             if (appType === 'pc' && cell.OpenType !== 'popview') return
 
             uuids.push(cell.uuid)
@@ -384,7 +386,7 @@
             return cell
           })
         }
-      } else if (item.type === 'table' && item.subtype === 'normaltable' && item.cols) {
+      } else if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable') && item.cols) {
         let loopCol = (col) => {
           col.subcols = col.subcols.map(c => {
             c.uuid = this.getuuid()
@@ -407,9 +409,12 @@
   
           return col
         }
-  
+        let _uuids = {}
         item.cols = item.cols.map(col => {
-          col.uuid = this.getuuid()
+          let uuid = this.getuuid()
+
+          _uuids[col.uuid] = uuid
+          col.uuid = uuid
   
           if (col.type === 'colspan' && col.subcols) {
             col = loopCol(col)
@@ -426,6 +431,15 @@
           }
           return col
         })
+
+        if (item.subtype === 'editable') {
+          item.cols = item.cols.map(col => {
+            if (col.editable === 'true' && col.enter && _uuids[col.enter]) {
+              col.enter = _uuids[col.enter]
+            }
+            return col
+          })
+        }
       }
   
       if (item.btnlog) {
@@ -580,7 +594,7 @@
           return cell
         })
       }
-    } else if (item.type === 'table' && item.subtype === 'normaltable' && item.cols) {
+    } else if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable') && item.cols) {
       let loopCol = (col) => {
         col.subcols = col.subcols.map(c => {
           c.uuid = this.getuuid()
@@ -599,8 +613,12 @@
         return col
       }
 
+      let _uuids = {}
       item.cols = item.cols.map(col => {
-        col.uuid = this.getuuid()
+        let uuid = this.getuuid()
+
+        _uuids[col.uuid] = uuid
+        col.uuid = uuid
 
         if (col.type === 'colspan' && col.subcols) {
           col = loopCol(col)
@@ -627,6 +645,15 @@
         }
         return col
       })
+
+      if (item.subtype === 'editable') {
+        item.cols = item.cols.map(col => {
+          if (col.editable === 'true' && col.enter && _uuids[col.enter]) {
+            col.enter = _uuids[col.enter]
+          }
+          return col
+        })
+      }
     } else if (item.type === 'form') {
       item.subcards = item.subcards.map(cell => {
         cell.uuid = this.getuuid()
@@ -667,6 +694,8 @@
       })
     }
     if (item.type === 'topbar') {
+      item.wrap.name = ''
+      item.name = ''
       if (item.search && item.search.fields) {
         item.search.fields = item.search.fields.map(cell => {
           cell.uuid = this.getuuid()

--
Gitblit v1.8.0