From 5ec0f02101cb4255c6398856bbf17a2a0b2c9a7e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 十一月 2022 17:33:55 +0800
Subject: [PATCH] 2022-11-14

---
 src/utils/utils-custom.js |   98 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 7284446..be31708 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -171,7 +171,7 @@
    * @description 鑾峰彇涓婄骇妯″潡
    * @return {String}  selfId  褰撳墠缁勪欢id
    */
-  static getSupModules (components, selfId) {
+  static getSupModules (components, selfId, interfaces) {
     let modules = []
     components.forEach(item => {
       if (item.uuid === selfId) {
@@ -264,7 +264,41 @@
       }
     })
 
+    if (interfaces && interfaces.length > 0) {
+      interfaces.forEach(item => {
+        modules.push({
+          value: item.uuid,
+          label: item.name
+        })
+      })
+    }
+
     return modules
+  }
+
+  /**
+   * @description 鑾峰彇涓婄骇妯″潡
+   * @return {String}  selfId  褰撳墠缁勪欢id
+   */
+  static checkSupModules (modules, supId) {
+    let has = false
+
+    let check = (list) => {
+      list.forEach(m => {
+        if (has) return
+        if (supId === m.value) {
+          has = true
+          return
+        }
+        if (m.children) {
+          check(m.children)
+        }
+      })
+    }
+
+    check(modules)
+   
+    return has
   }
 
   /**
@@ -589,6 +623,9 @@
         if (em) {
           item.setting.supModule = ''
         }
+        if (item.wrap && item.wrap.supModule) {
+          item.wrap.supModule = item.setting.supModule
+        }
       }
 
       if (item.wrap && item.wrap.doubleClick) {
@@ -796,16 +833,10 @@
     }
 
     if (item.setting && item.setting.supModule && item.setting.supModule[0] !== 'empty') {
-      let em = false
-      item.setting.supModule = item.setting.supModule.map(c => {
-        if (!uuids[c]) {
-          em = true
-        }
-        return uuids[c] || ''
-      })
-      if (em) {
-        item.setting.supModule = ''
-      }
+      item.setting.supModule = ''
+    }
+    if (item.wrap && item.wrap.supModule) {
+      item.wrap.supModule = ''
     }
 
     if (item.wrap && item.wrap.doubleClick) {
@@ -841,6 +872,25 @@
 }
 
 /**
+ * @description 鑾峰彇鍥捐〃楂樺害
+ */
+export function getHeight (val) {
+  if (typeof(val) === 'string') {
+    if (val.indexOf('px') > -1) {
+      val = parseFloat(val)
+    } else if (val.indexOf('vw') > -1) {
+      val = parseFloat(val)
+      val = document.body.clientWidth * val / 100
+    } else if (val.indexOf('vh') > -1) {
+      val = parseFloat(val)
+      val = document.body.clientHeight * val / 100
+    }
+  }
+
+  return parseInt(val || 400) - 30
+}
+
+/**
  * @description 鑾峰彇琛ㄥ悕
  */
 export function getTables (config, pops) {
@@ -849,7 +899,7 @@
   let cutreg = /(from|update|insert\s+into)\s+(@db@)?[a-z_]+/ig
   let trimreg = /(from|update|insert\s+into)\s+(@db@)?/ig
 
-  if (!config.wrap || !config.wrap.datatype || config.wrap.datatype === 'dynamic') {
+  if (config.setting && (!config.wrap || !config.wrap.datatype || config.wrap.datatype === 'dynamic')) {
     if (config.setting.interType === 'system') {
       if (config.setting.execute !== 'false') {
         let tbs = config.setting.dataresource.match(cutreg)
@@ -860,7 +910,7 @@
         let tbs = script.sql.match(cutreg)
         tbs && cuts.push(...tbs)
       })
-    } else {
+    } else if (config.setting.tableName) {
       let tb = config.setting.tableName.replace(/@db@|\s+/ig, '')
       if (/[a-z_]+/ig.test(tb)) {
         tables.push(tb)
@@ -868,11 +918,24 @@
     }
   }
 
+  config.search && config.search.forEach(cell => {
+    if (cell.resourceType === '1' && cell.dataSource) {
+      let tbs = cell.dataSource.match(cutreg)
+      tbs && cuts.push(...tbs)
+    }
+  })
+
   let action = []
 
   if (config.type === 'form') {
     config.subcards.forEach(item => {
       action.push(item.subButton)
+      item.fields && item.fields.forEach(cell => {
+        if (cell.resourceType === '1' && cell.dataSource) {
+          let tbs = cell.dataSource.match(cutreg)
+          tbs && cuts.push(...tbs)
+        }
+      })
     })
   } else if (config.subcards) {
     config.subcards.forEach(item => {
@@ -905,6 +968,7 @@
       }
     })
   }
+
   config.cols && config.cols.forEach(col => {
     if (col.type === 'action') {
       col.elements.forEach(cell => {
@@ -980,6 +1044,14 @@
         tbs && cuts.push(...tbs)
       }
     } else {
+      if (btn.OpenType === 'pop' && btn.modal && btn.modal.fields) {
+        btn.modal.fields.forEach(cell => {
+          if (cell.resourceType === '1' && cell.dataSource) {
+            let tbs = cell.dataSource.match(cutreg)
+            tbs && cuts.push(...tbs)
+          }
+        })
+      }
       if (btn.intertype === 'inner') return
       if (btn.intertype === 'outer' || btn.intertype === 'custom') {
         if (btn.procMode === 'system' && btn.verify) {

--
Gitblit v1.8.0