From 1a11f7115e61c548f9ffc77d0a9e504307ca71b2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 八月 2021 18:37:20 +0800
Subject: [PATCH] 2021-08-24

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

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 43a7b75..601ab7f 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -97,6 +97,11 @@
           value: item.uuid,
           label: item.name
         }
+      } else if (item.type === 'form') { // 鏁版嵁鏍煎紡锛屽瓨鍦ㄦ暟鎹簮
+        return {
+          value: item.uuid,
+          label: item.name
+        }
       } else if (item.type === 'tabs') {
         let _item = {
           value: item.uuid,
@@ -244,7 +249,11 @@
    * @return {String}  name
    */
   static getDelButtonIds (card) {
+    let appType = sessionStorage.getItem('appType')
     let uuids = []
+
+    if (appType === 'mob') return uuids
+
     const getUuids = (item) => {
       if (item.type === 'tabs') {
         item.subtabs.forEach(tab => {
@@ -257,48 +266,41 @@
           getUuids(c)
         })
       } else {
-        if (item.action && item.action.length > 0) {
-          item.action.forEach(act => {
-            if (!act.origin) {
-              uuids.push(act.uuid)
-            }
-          })
-        }
-        if (item.type === 'card') {
-          item.subcards.forEach(_card => {
+        item.action && item.action.forEach(act => {
+          if (act.origin || (appType === 'pc' && act.OpenType !== 'popview')) return
+
+          uuids.push(act.uuid)
+        })
+
+        if (card.type === 'card' || item.type === 'carousel' || (card.type === 'table' && card.subtype === 'tablecard')) {
+          card.subcards.forEach(_card => {
             _card.elements && _card.elements.forEach(cell => {
-              if (cell.eleType === 'button') {
-                uuids.push(cell.uuid)
-              }
-            })
-            _card.backElements && _card.backElements.forEach(cell => {
-              if (cell.eleType === 'button') {
-                uuids.push(cell.uuid)
-              }
-            })
-          })
-        } else if (item.type === 'carousel') {
-          item.subcards.forEach(_card => {
-            _card.elements && _card.elements.forEach(cell => {
-              if (cell.eleType === 'button') {
-                uuids.push(cell.uuid)
-              }
-            })
-          })
-        } else if (item.type === 'table' && item.subtype === 'tablecard') {
-          item.subcards.forEach(_card => {
-            _card.elements && _card.elements.forEach(cell => {
-              if (cell.eleType === 'button') {
-                uuids.push(cell.uuid)
-              }
-            })
-          })
-        } else if (item.type === 'table' && item.subtype === 'normaltable') {
-          item.cols && item.cols.forEach(col => {
-            if (col.type !== 'action') return
-            col.elements && col.elements.forEach(cell => {
+              if (cell.eleType !== 'button') return
+              if (appType === 'pc' && cell.OpenType !== 'popview') return
+  
               uuids.push(cell.uuid)
             })
+            _card.backElements && _card.backElements.forEach(cell => {
+              if (cell.eleType !== 'button') return
+              if (appType === 'pc' && cell.OpenType !== 'popview') return
+  
+              uuids.push(cell.uuid)
+            })
+          })
+        } else if (card.type === 'table' && card.subtype === 'normaltable') {
+          card.cols && card.cols.forEach(col => {
+            if (col.type !== 'action') return
+            col.elements && col.elements.forEach(cell => {
+              if (appType === 'pc' && cell.OpenType !== 'popview') return
+  
+              uuids.push(cell.uuid)
+            })
+          })
+        } else if (card.type === 'balcony') {
+          card.elements && card.elements.forEach(cell => {
+            if (appType === 'pc' && cell.OpenType !== 'popview') return
+
+            uuids.push(cell.uuid)
           })
         }
       }
@@ -375,6 +377,13 @@
             })
           }
         })
+      } else if (item.type === 'balcony') {
+        if (item.elements) {
+          item.elements = item.elements.map(cell => {
+            cell.uuid = this.getuuid()
+            return cell
+          })
+        }
       } else if (item.type === 'table' && item.subtype === 'normaltable' && item.cols) {
         let loopCol = (col) => {
           col.subcols = col.subcols.map(c => {
@@ -429,7 +438,24 @@
           return cell
         })
       }
-      if (item.search) {
+      if (item.type === 'topbar') {
+        if (item.search && item.search.fields) {
+          item.search.fields = item.search.fields.map(cell => {
+            cell.uuid = this.getuuid()
+            return cell
+          })
+        }
+        if (item.search && item.search.groups) {
+          item.search.groups = item.search.groups.map(cell => {
+            cell.uuid = this.getuuid()
+            cell.fields = cell.fields.map(m => {
+              m.uuid = this.getuuid()
+              return m
+            })
+            return cell
+          })
+        }
+      } else if (item.search) {
         item.search = item.search.map(cell => {
           cell.uuid = this.getuuid()
           return cell

--
Gitblit v1.8.0