From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/utils/utils-custom.js | 1203 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 1,019 insertions(+), 184 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 27a4c57..87a4db3 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -451,11 +451,7 @@
             card.elements = card.elements.map(cell => {
               if (cell.eleType === 'button') {
                 cell.uuid = md5(commonId + cell.uuid)
-                if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                  cell.pageTemplate = ''
-                  cell.linkmenu = ''
-                }
-                this.resetBtn(cell, commonId)
+                this.resetBtn(cell, commonId, clear)
               } else {
                 cell.uuid = this.getuuid()
               }
@@ -467,11 +463,7 @@
             card.backElements = card.backElements.map(cell => {
               if (cell.eleType === 'button') {
                 cell.uuid = md5(commonId + cell.uuid)
-                if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                  cell.pageTemplate = ''
-                  cell.linkmenu = ''
-                }
-                this.resetBtn(cell, commonId)
+                this.resetBtn(cell, commonId, clear)
               } else {
                 cell.uuid = this.getuuid()
               }
@@ -491,11 +483,7 @@
           item.elements = item.elements.map(cell => {
             if (cell.eleType === 'button') {
               cell.uuid = md5(commonId + cell.uuid)
-              if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                cell.pageTemplate = ''
-                cell.linkmenu = ''
-              }
-              this.resetBtn(cell, commonId)
+              this.resetBtn(cell, commonId, clear)
             } else {
               cell.uuid = this.getuuid()
             }
@@ -528,12 +516,7 @@
                 cell.uuid = md5(commonId + cell.uuid)
 
                 if (cell.eleType === 'button') {
-                  if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-                    cell.pageTemplate = ''
-                    cell.linkmenu = ''
-                  }
-
-                  this.resetBtn(cell, commonId)
+                  this.resetBtn(cell, commonId, clear)
                 }
 
                 return cell
@@ -572,11 +555,15 @@
           })
 
           if (cell.subButton) {
-            this.resetBtn(cell.subButton, commonId)
+            this.resetBtn(cell.subButton, commonId, clear)
           }
 
           return cell
         })
+      } else if (item.type === 'login') {
+        if (clear) {
+          item.wrap.linkmenu = ''
+        }
       }
   
       if (item.btnlog) {
@@ -587,12 +574,7 @@
         item.action = item.action.map(cell => {
           cell.uuid = md5(commonId + cell.uuid)
 
-          if (clear && cell.pageTemplate === 'linkpage' && cell.linkmenu) {
-            cell.pageTemplate = ''
-            cell.linkmenu = ''
-          }
-
-          this.resetBtn(cell, commonId)
+          this.resetBtn(cell, commonId, clear)
 
           return cell
         })
@@ -650,15 +632,25 @@
   /**
    * @description 鎸夐挳閲嶇疆
    */
-  static resetBtn (btn, commonId) {
+  static resetBtn (btn, commonId, clear = false) {
     if (btn.OpenType === 'pop' || (btn.OpenType === 'funcbutton' && btn.execMode === 'pop')) {
-      if (btn.modal && btn.modal.fields.length > 0) {
+      if (btn.modal && btn.modal.fields && btn.modal.fields.length > 0) {
         btn.modal.fields = btn.modal.fields.map(m => {
           m.uuid = this.getuuid()
           return m
         })
       }
     }
+
+    if (clear) {
+      if (btn.pageTemplate === 'linkpage') {
+        btn.pageTemplate = ''
+      }
+      delete btn.linkmenu
+      delete btn.openmenu
+      delete btn.refreshTab
+    }
+    
     if (btn.switchTab && btn.switchTab.length > 0) {
       btn.switchTab = btn.switchTab.map(m => md5(commonId + m))
     }
@@ -666,6 +658,15 @@
       btn.anchors = btn.anchors.map(m => md5(commonId + m))
     }
     if (btn.syncComponent && btn.syncComponent[0] === 'multiComponent' && btn.syncComponents) {
+      if (btn.syncComponents[0] && Array.isArray(btn.syncComponents[0])) {
+        btn.syncComponents = btn.syncComponents.map((item, i) => {
+          return {
+            syncComId: item,
+            label: '',
+            uuid: 'fixed' + i
+          }
+        })
+      }
       btn.syncComponents = btn.syncComponents.map(m => {
         m.syncComId = m.syncComId.map(n => {
           if (/\$focus/.test(n)) {
@@ -684,6 +685,10 @@
 
         return md5(commonId + m)
       })
+    }
+
+    if (btn.OpenType === 'popview' && btn.config && btn.config.components) {
+      btn.config.components = this.resetConfig(btn.config.components, commonId)
     }
   }
 
@@ -771,14 +776,7 @@
             if (cell.eleType === 'button') {
               cell.uuid = md5(commonId + cell.uuid)
 
-              if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-                if (cell.modal && cell.modal.fields.length > 0) {
-                  cell.modal.fields = cell.modal.fields.map(m => {
-                    m.uuid = this.getuuid()
-                    return m
-                  })
-                }
-              }
+              this.resetBtn(cell, commonId)
             } else {
               cell.uuid = this.getuuid()
             }
@@ -792,14 +790,8 @@
           card.backElements = card.backElements.map(cell => {
             if (cell.eleType === 'button') {
               cell.uuid = md5(commonId + cell.uuid)
-              if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-                if (cell.modal && cell.modal.fields.length > 0) {
-                  cell.modal.fields = cell.modal.fields.map(m => {
-                    m.uuid = this.getuuid()
-                    return m
-                  })
-                }
-              }
+
+              this.resetBtn(cell, commonId)
             } else {
               cell.uuid = this.getuuid()
             }
@@ -818,14 +810,8 @@
         item.elements = item.elements.map(cell => {
           if (cell.eleType === 'button') {
             cell.uuid = md5(commonId + cell.uuid)
-            if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-              if (cell.modal && cell.modal.fields.length > 0) {
-                cell.modal.fields = cell.modal.fields.map(m => {
-                  m.uuid = this.getuuid()
-                  return m
-                })
-              }
-            }
+
+            this.resetBtn(cell, commonId)
           } else {
             cell.uuid = this.getuuid()
           }
@@ -850,14 +836,7 @@
             col.elements = col.elements.map(cell => {
               cell.uuid = md5(commonId + cell.uuid)
               if (cell.eleType === 'button') {
-                if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-                  if (cell.modal && cell.modal.fields.length > 0) {
-                    cell.modal.fields = cell.modal.fields.map(m => {
-                      m.uuid = this.getuuid()
-                      return m
-                    })
-                  }
-                }
+                this.resetBtn(cell, commonId)
               }
               return cell
             })
@@ -902,14 +881,7 @@
       }
       item.action = item.action.map(cell => {
         cell.uuid = md5(commonId + cell.uuid)
-        if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
-          if (cell.modal && cell.modal.fields.length > 0) {
-            cell.modal.fields = cell.modal.fields.map(m => {
-              m.uuid = this.getuuid()
-              return m
-            })
-          }
-        }
+        this.resetBtn(cell, commonId)
 
         return cell
       })
@@ -1914,6 +1886,25 @@
     if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
       if (!cell.modal || cell.modal.fields.length === 0) {
         errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
+      } else if (cell.OpenType === 'pop') {
+        let forms = []
+        cell.modal.fields.forEach(n => {
+          if (n.type === 'funcvar' && n.field) {
+            forms.push(n.field)
+          }
+        })
+        if (cell.verify && cell.verify.billcodes && cell.verify.billcodes.length > 0) {
+          let bills = cell.verify.billcodes.filter(item => item.status !== 'false').map(item => item.field)
+          bills.forEach(n => {
+            if (!forms.includes(n)) {
+              errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍗曞彿鐢熸垚鐨勫嚱鏁板彉閲忊��${n}鈥濅笉瀛樺湪`})
+            }
+          })
+          forms = forms.filter(n => !bills.includes(n))
+        }
+        if (forms.length) {
+          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍑芥暟鍙橀噺琛ㄥ崟鈥�${forms.join(',')}鈥濆皻鏈娇鐢╜})
+        }
       }
     } else if (cell.OpenType === 'excelIn') {
       if (!cell.verify || !cell.verify.sheet || !cell.verify.columns || cell.verify.columns.length === 0) {
@@ -1945,8 +1936,12 @@
     if (['pop', 'prompt', 'exec'].includes(cell.OpenType) && cell.verify && !cell.output) {
       if (cell.verify.noteEnable === 'true') {
         errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊肩煭淇″彂閫佹棤鏁堬紒`})
+      } else if (cell.verify.wxNote === 'true') {
+        errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊煎叕浼楀彿娑堟伅鏃犳晥锛乣})
       } else if (cell.verify.emailEnable === 'true') {
         errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊奸偖浠跺彂閫佹棤鏁堬紒`})
+      } else if (cell.verify.DeepSeekable === 'true') {
+        errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濇湭璁剧疆杩斿洖鍊糄eekSeek鏃犳晥锛乣})
       }
     }
 
@@ -1963,6 +1958,10 @@
           })
         }
         let emptys = []
+        if (cell.Ot !== 'notRequired') {
+          forms.push(...columns)
+        }
+
         cell.verify.uniques.forEach(m => {
           if (m.status === 'false') return
 
@@ -1974,21 +1973,30 @@
         })
 
         if (emptys.length) {
-          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓笉瀛樺湪锛乣})
+          if (cell.Ot === 'notRequired') {
+            errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓笉瀛樺湪锛乣})
+          } else {
+            errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濆敮涓�鎬ч獙璇佸瓧娈�${emptys.join('銆�')}锛屽湪琛ㄥ崟涓庡瓧娈甸泦涓笉瀛樺湪锛乣})
+          }
         }
       }
 
       if (cell.OpenType === 'form' && cell.formType === 'count_line') return
      
-      if (cell.intertype === 'system') {
-        if (cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
-          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
-        }
-      } else if (cell.intertype === 'custom' || cell.intertype === 'outer') {
-        if (cell.callbackType === 'script' && (!cell.verify || !cell.verify.cbScripts || cell.verify.cbScripts.filter(item => item.status !== 'false').length === 0)) {
-          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鑷畾涔夎剼鏈洖璋冿紝鍥炶皟鑴氭湰涓嶅彲涓虹┖锛乣})
-        } else if (cell.procMode === 'system' && cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
-          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
+      // if (cell.intertype === 'system') {
+      //   // if (cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
+      //   //   errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
+      //   // }
+      // } else if (cell.intertype === 'custom' || cell.intertype === 'outer') {
+      //   if (cell.callbackType === 'script' && (!cell.verify || !cell.verify.cbScripts || cell.verify.cbScripts.filter(item => item.status !== 'false').length === 0)) {
+      //     errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鑷畾涔夎剼鏈洖璋冿紝鍥炶皟鑴氭湰涓嶅彲涓虹┖锛乣})
+      //   // } else if (cell.procMode === 'system' && cell.Ot === 'notRequired' && cell.verify && cell.verify.voucher && cell.verify.voucher.enabled) {
+      //   //   errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒`})
+      //   }
+      // }
+      if ((cell.intertype === 'custom' || cell.intertype === 'outer') && cell.callbackType === 'script') {
+        if (!cell.verify || !cell.verify.cbScripts) {
+          errors.push({ level: 0, detail: `鎸夐挳鈥�${cell.label}鈥濅娇鐢ㄤ簡鑷畾涔夎剼鏈洖璋冿紝璇疯缃獙璇佷俊鎭紒`})
         }
       }
     } else if (cell.OpenType === 'funcbutton') {
@@ -2105,6 +2113,80 @@
     }
   }
 
+  if (card.$c_fc) {
+    let idCtrl = false
+    let supModule = ''
+
+    if (card.wrap.datatype === 'dynamic') {
+      supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
+      if (supModule === 'empty') {
+        supModule = ''
+      }
+    } else {
+      if (card.wrap.datatype === 'static') {
+        supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
+      } else {
+        supModule = null
+      }
+    }
+
+    card.subcards.forEach(item => {
+      if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
+        errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+      }
+      if (item.subButton.Ot === 'requiredSgl' && card.wrap.datatype === 'static') {
+        errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳閫夎鏃朵笉鍙娇鐢ㄩ潤鎬佹暟鎹簮`})
+      }
+      if (item.subButton.verify && !item.subButton.output) {
+        if (item.subButton.verify.noteEnable === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+        } else if (item.subButton.verify.wxNote === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�煎叕浼楀彿娑堟伅鏃犳晥锛乣})
+        } else if (item.subButton.verify.emailEnable === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+        } else if (item.subButton.verify.DeepSeekable === 'true') {
+          errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�糄eekSeek鏃犳晥锛乣})
+        }
+      }
+
+      let forms = []
+      item.fields.forEach(m => {
+        if (m.type === 'funcvar' && m.field) {
+          forms.push(m.field)
+        }
+        if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
+          idCtrl = true
+        }
+        if (m.type === 'linkMain' && !supModule && supModule !== null) {
+          if (item.setting && item.setting.title) {
+            errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄})
+          } else {
+            errors.push({ level: 1, detail: `璇锋鏌ュ叧鑱斾富琛ㄢ��${m.label}鈥濇槸鍚︽湁鏁坄})
+          }
+        }
+      })
+      
+      if (item.subButton.verify && item.subButton.verify.billcodes && item.subButton.verify.billcodes.length > 0) {
+        let bills = item.subButton.verify.billcodes.filter(item => item.status !== 'false').map(item => item.field)
+        bills.forEach(n => {
+          if (!forms.includes(n)) {
+            errors.push({ level: 0, detail: `鎸夐挳鈥�${item.subButton.label}鈥濅腑鍗曞彿鐢熸垚鐨勫嚱鏁板彉閲忊��${n}鈥濅笉瀛樺湪`})
+          }
+        })
+        forms = forms.filter(n => !bills.includes(n))
+      }
+      if (forms.length) {
+        if (item.setting && item.setting.title) {
+          errors.push({ level: 0, detail: `鍒嗙粍鈥�${item.setting.title}鈥濅腑鍑芥暟鍙橀噺琛ㄥ崟鈥�${forms.join(',')}鈥濆皻鏈娇鐢╜})
+        } else {
+          errors.push({ level: 0, detail: `鍑芥暟鍙橀噺琛ㄥ崟鈥�${forms.join(',')}鈥濆皻鏈娇鐢╜})
+        }
+      }
+    })
+
+    card.idCtrl = idCtrl
+  }
+
   return errors
 }
 
@@ -2126,6 +2208,7 @@
   let _ch_d = sql.match(/@check\$/ig)
   let _m_b = sql.match(/\$@/ig)
   let _m_d = sql.match(/@\$/ig)
+  let caseErr = false
 
   _quot = _quot ? _quot.length : 0
   _lparen = _lparen ? _lparen.length : 0
@@ -2134,6 +2217,14 @@
   _ch_d = _ch_d ? _ch_d.length : 0
   _m_b = _m_b ? _m_b.length : 0
   _m_d = _m_d ? _m_d.length : 0
+
+  if (/case\s+when\s+[\s\S]+\send(\s|\n|$)/ig.test(sql)) {
+    sql.match(/case\s+when\s+[\s\S]+\send(\s|\n|$)/ig).forEach(line => {
+      if (!/\selse\s/ig.test(line)) {
+        caseErr = true
+      }
+    })
+  }
 
   if (_quot % 2 !== 0) {
     notification.warning({
@@ -2197,40 +2288,6 @@
       duration: 5
     })
     return false
-  } else if (/,\./ig.test(sql)) {
-    let lines = []
-    sql.split(/\n/).forEach((s, i) => {
-      if (/,\./ig.test(s)) {
-        lines.push(i + 1)
-      }
-    })
-
-    lines = lines.join('銆�')
-    lines = lines ? '(绗�' + lines + '琛�)' : ''
-
-    notification.warning({
-      top: 92,
-      message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿,.`,
-      duration: 5
-    })
-    return false
-  } else if (/\.,/ig.test(sql)) {
-    let lines = []
-    sql.split(/\n/).forEach((s, i) => {
-      if (/\.,/ig.test(s)) {
-        lines.push(i + 1)
-      }
-    })
-
-    lines = lines.join('銆�')
-    lines = lines ? '(绗�' + lines + '琛�)' : ''
-
-    notification.warning({
-      top: 92,
-      message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿.,`,
-      duration: 5
-    })
-    return false
   } else if (/鈥榺鈥�/ig.test(sql)) {
     let lines = []
     sql.split(/\n/).forEach((s, i) => {
@@ -2256,9 +2313,23 @@
     })
     return false
   } else if (/\sdecimal\(8,/ig.test(sql)) {
+    let lines = ''
+    sql.split(/\n/).forEach((s, i) => {
+      if (/(^|\s)decimal\(8,/ig.test(s)) {
+        lines = '绗�' + (i + 1) + '琛屼腑'
+      }
+    })
+
     notification.warning({
       top: 92,
-      message: `涓嶅彲浣跨敤 decimal(8`,
+      message: `${lines}涓嶅彲浣跨敤 decimal(8`,
+      duration: 5
+    })
+    return false
+  } else if (caseErr) {
+    notification.warning({
+      top: 92,
+      message: 'case when 璇彞闇�瑕佹湁 else',
       duration: 5
     })
     return false
@@ -2319,6 +2390,38 @@
       duration: 5
     })
     return false
+  } else if (/,\./ig.test(sql)) {
+    let lines = []
+    sql.split(/\n/).forEach((s, i) => {
+      if (/,\./ig.test(s)) {
+        lines.push(i + 1)
+      }
+    })
+
+    lines = lines.join('銆�')
+    lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+    notification.warning({
+      top: 92,
+      message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿,.`,
+      duration: 5
+    })
+  } else if (/\.,/ig.test(sql)) {
+    let lines = []
+    sql.split(/\n/).forEach((s, i) => {
+      if (/\.,/ig.test(s)) {
+        lines.push(i + 1)
+      }
+    })
+
+    lines = lines.join('銆�')
+    lines = lines ? '(绗�' + lines + '琛�)' : ''
+
+    notification.warning({
+      top: 92,
+      message: label + `${lines}锛屼笉鍙嚭鐜拌嫳鏂囬�楀彿.,`,
+      duration: 5
+    })
   }
 
   return true
@@ -2328,6 +2431,8 @@
  * @description 鑾峰彇璇█杞崲淇℃伅
  */
 export function getLangTrans (config) {
+  if (sessionStorage.getItem('lang') !== 'zh-CN') return ''
+
   let langList = sessionStorage.getItem('langList')
   let appType = sessionStorage.getItem('appType')
 
@@ -2335,18 +2440,19 @@
     langList = sessionStorage.getItem('applangList')
   }
   
-  if (!langList) return
-
-  let defLang = ''
+  if (!langList) return ''
 
   try {
     langList = JSON.parse(langList)
-    defLang = langList[0]
   } catch (e) {
-    defLang = ''
+    langList = ''
   }
 
-  if (!defLang) return ''
+  if (!langList) return ''
+
+  langList = langList.filter(n => n !== 'zh-CN')
+
+  if (langList.length === 0) return ''
 
   let sql = []
   let btn = []
@@ -2369,8 +2475,9 @@
   let filterSql = (sl) => {
     if (!sl) return
 
+    let _sl = sl.replace(/\/\*[^*/]+\*\//g, '')
     let cutreg = /[\u4E00-\u9FA5銆傦紒锛屻�乚+/ig
-    let tbs = sl.match(cutreg)
+    let tbs = _sl.match(cutreg)
 
     if (!tbs) return
     
@@ -2380,8 +2487,18 @@
   let filterBtn = (btn) => {
     if (!btn.verify) return
 
+    btn.verify.columns && btn.verify.columns.forEach(col => {
+      if (col.Text) {
+        sql.push(col.Text)
+      }
+    })
+
     btn.verify.customverifys && btn.verify.customverifys.forEach(script => {
       filterSql(script.sql)
+
+      if (script.errmsg) {
+        sql.push(script.errmsg)
+      }
     })
     btn.verify.scripts && btn.verify.scripts.forEach(script => {
       filterSql(script.sql)
@@ -2422,12 +2539,22 @@
       } else if (item.type === 'group') {
         traversal(item.components)
       } else {
+        if (item.wrap && item.wrap.title) {
+          sql.push(item.wrap.title)
+        }
+        if (item.plot && item.plot.title) {
+          sql.push(item.plot.title)
+        }
+        
         if (item.setting && (!item.wrap || !item.wrap.datatype || item.wrap.datatype === 'dynamic')) {
           if (item.setting.interType === 'system') {
             filterSql(item.setting.dataresource)
             item.scripts && item.scripts.forEach(script => {
               filterSql(script.sql)
             })
+          }
+          if (item.setting.supModTip) {
+            sql.push(item.setting.supModTip)
           }
         }
 
@@ -2605,6 +2732,9 @@
           filterSql(script.sql)
         })
       }
+      if (item.setting.supModTip) {
+        sql.push(item.setting.supModTip)
+      }
     })
   }
 
@@ -2638,6 +2768,21 @@
   text = text.filter(Boolean)
   menu = menu.filter(Boolean)
 
+  sql = sql.map(n => n.replace(/^\s+|\s+$/g, '').replace(/(:|锛�)$/g, ''))
+  btn = btn.map(n => n.replace(/^\s+|\s+$/g, ''))
+  ops = ops.map(n => n.replace(/^\s+|\s+$/g, ''))
+  menu = menu.map(n => n.replace(/^\s+|\s+$/g, ''))
+
+  sql = sql.filter((n) => {
+    if (!n) return false
+    if (/^[a-zA-Z_]+$/.test(n)) return false
+
+    return true
+  })
+  btn = btn.filter(Boolean)
+  ops = ops.filter(Boolean)
+  menu = menu.filter(Boolean)
+
   sql = Array.from(new Set(sql))
   btn = Array.from(new Set(btn))
   ops = Array.from(new Set(ops))
@@ -2655,8 +2800,6 @@
   let result = []
 
   langList.forEach(lan => {
-    if (lan === defLang) return
-
     list.forEach(n => {
       result.push(`'${lan}',${n}`)
     })
@@ -2673,31 +2816,159 @@
 export function setLangTrans (config, btnDict, titDict, lisDict, menuDict, regs, tail) {
   let filterElement = (card) => {
     if (card.datatype === 'static' && card.eleType === 'text' && !/@.+@/g.test(card.value)) {
-      if (card.value && titDict[card.value]) {
-        card.value = titDict[card.value]
+      if (card.value) {
+        card.value = replaceTitle(card.value)
       }
     }
-    if (card.prefix && titDict[card.prefix]) {
-      card.prefix = titDict[card.prefix]
+    if (card.prefix) {
+      card.prefix = replaceTitle(card.prefix)
     }
-    if (card.postfix && titDict[card.postfix]) {
-      card.postfix = titDict[card.postfix]
+    if (card.postfix) {
+      card.postfix = replaceTitle(card.postfix)
     }
+  }
+
+  let replaceTitle = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+
+    if聽(/(:|锛�)$/g.test(val)) {
+      let _val = val.replace(/(:|锛�)$/g,聽'')
+      if聽(titDict[_val]) {
+        val = titDict[_val] + val.substr(-1)
+      }聽else if (titDict[val]) {
+        val = titDict[val]
+      }
+    }聽else if (titDict[val]) {
+      val = titDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let replaceBtn = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+
+    if (btnDict[val]) {
+      val = btnDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let replaceList = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+
+    if (lisDict[val]) {
+      val = lisDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let replaceMenu = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+
+    if (menuDict[val]) {
+      val = menuDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let getuuid = () => {
+    let uuid = []
+    let _options = '0123456789abcdefghigklmnopqrstuv'
+    for (let i = 0; i < 19; i++) {
+      uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+    }
+    return uuid.join('')
   }
 
   let filterSql = (sl) => {
     if (!sl) return
 
+    let arr = []
+    
+    sl = sl.replace(/\/\*[^*/]+\*\//g, (word) => {
+      let uuid = getuuid()
+      arr.push({id: `/*${uuid}*/`, value: word})
+      return `/*${uuid}*/`
+    })
+
     regs.forEach(item => {
       sl = sl.replace(item.reg, item.value)
+    })
+
+    arr.forEach(item => {
+      sl = sl.replace(item.id, item.value)
     })
 
     return sl
   }
 
   let filterBtn = (btn) => {
-    if (btn.label && btnDict[btn.label]) {
-      btn.label = btnDict[btn.label]
+    if (btn.label) {
+      btn.label = replaceBtn(btn.label)
     }
 
     if (btn.OpenType === 'tab' && btn.linkmenu) {
@@ -2753,8 +3024,24 @@
 
     if (!btn.verify) return
 
+    btn.verify.columns && btn.verify.columns.forEach(col => {
+      if (col.Text) {
+        col.Text = replaceTitle(col.Text)
+      }
+    })
+
+    btn.verify.uniques && btn.verify.uniques.forEach(col => {
+      if (col.fieldlabel) {
+        col.fieldlabel = col.fieldlabel.split(',').map(n => replaceTitle(n)).join(',')
+      }
+    })
+    
     btn.verify.customverifys && btn.verify.customverifys.forEach(script => {
       script.sql = filterSql(script.sql)
+
+      if (script.errmsg) {
+        script.errmsg = replaceTitle(script.errmsg)
+      }
     })
     btn.verify.scripts && btn.verify.scripts.forEach(script => {
       script.sql = filterSql(script.sql)
@@ -2773,15 +3060,15 @@
   }
 
   let filterForm = (n) => {
-    if (n.label && titDict[n.label]) {
-      n.label = titDict[n.label]
+    if (n.label) {
+      n.label = replaceTitle(n.label)
     }
     if (n.resourceType === '1') {
       n.dataSource = filterSql(n.dataSource)
     } else if (n.options) {
       n.options.forEach(o => {
-        if (o.Text && lisDict[o.Text]) {
-          o.Text = lisDict[o.Text]
+        if (o.Text) {
+          o.Text = replaceList(o.Text)
         }
       })
     }
@@ -2835,14 +3122,20 @@
     components.forEach(item => {
       if (item.type === 'tabs') {
         item.subtabs.forEach(tab => {
-          if (tab.label && titDict[tab.label]) {
-            tab.label = titDict[tab.label]
+          if (tab.label) {
+            tab.label = replaceTitle(tab.label)
           }
           traversal(tab.components)
         })
       } else if (item.type === 'group') {
         traversal(item.components)
       } else {
+        if (item.wrap && item.wrap.title) {
+          item.wrap.title = replaceTitle(item.wrap.title)
+        }
+        if (item.plot && item.plot.title) {
+          item.plot.title = replaceTitle(item.plot.title)
+        }
         if (item.wrap && (item.wrap.click === 'menu' || item.wrap.click === 'menus')) {
           if (item.wrap.click === 'menu') {
             resetMenu(item.wrap)
@@ -2863,12 +3156,15 @@
               script.sql = filterSql(script.sql)
             })
           }
+          if (item.setting.supModTip) {
+            item.setting.supModTip = replaceTitle(item.setting.supModTip)
+          }
         }
 
         if (item.columns) {
           item.columns.forEach(cell => {
-            if (cell.label && titDict[cell.label]) {
-              cell.label = titDict[cell.label]
+            if (cell.label) {
+              cell.label = replaceTitle(cell.label)
             }
           })
         }
@@ -2915,8 +3211,8 @@
           item.wrap.linkmenu = item.wrap.linkmenu.slice(0, 24) + tail
         } else if (item.type === 'menubar') {
           item.subMenus = item.subMenus.map(cell => {
-            if (cell.setting.name && menuDict[cell.setting.name]) {
-              cell.setting.name = menuDict[cell.setting.name]
+            if (cell.setting.name) {
+              cell.setting.name = replaceMenu(cell.setting.name)
             }
             if (cell.setting.type === 'linkmenu') {
               cell.setting.linkMenuId = cell.setting.linkMenuId.slice(0, 24) + tail
@@ -2987,14 +3283,14 @@
         } else if (item.type === 'table') {
           let loopCol = (cols) => {
             cols.forEach(col => {
-              if (col.label && titDict[col.label]) {
-                col.label = titDict[col.label]
+              if (col.label) {
+                col.label = replaceTitle(col.label)
               }
-              if (col.prefix && titDict[col.prefix]) {
-                col.prefix = titDict[col.prefix]
+              if (col.prefix) {
+                col.prefix = replaceTitle(col.prefix)
               }
-              if (col.postfix && titDict[col.postfix]) {
-                col.postfix = titDict[col.postfix]
+              if (col.postfix) {
+                col.postfix = replaceTitle(col.postfix)
               }
               if (col.type === 'colspan') {
                 loopCol(col.subcols)
@@ -3038,6 +3334,420 @@
         item.scripts && item.scripts.forEach(script => {
           script.sql = filterSql(script.sql)
         })
+      }
+      if (item.setting.supModTip) {
+        item.setting.supModTip = replaceTitle(item.setting.supModTip)
+      }
+    })
+  }
+
+  traversal(config.components)
+}
+
+/**
+ * @description 璇█杞崲
+ */
+export function setLangSingleTrans (config, btnDict, titDict, lisDict, menuDict, regs) {
+  let filterElement = (card) => {
+    if (card.datatype === 'static' && card.eleType === 'text' && !/@.+@/g.test(card.value)) {
+      if (card.value) {
+        card.value = replaceTitle(card.value)
+      }
+    }
+    if (card.prefix) {
+      card.prefix = replaceTitle(card.prefix)
+    }
+    if (card.postfix) {
+      card.postfix = replaceTitle(card.postfix)
+    }
+  }
+
+  let replaceTitle = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+    if聽(/(:|锛�)$/g.test(val)) {
+      let _val = val.replace(/(:|锛�)$/g,聽'')
+      if聽(titDict[_val]) {
+        val = titDict[_val] + val.substr(-1)
+      }聽else if (titDict[val]) {
+        val = titDict[val]
+      }
+    }聽else if (titDict[val]) {
+      val = titDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let replaceBtn = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+
+    if (btnDict[val]) {
+      val = btnDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let replaceList = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+
+    if (lisDict[val]) {
+      val = lisDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let replaceMenu = (val)聽=> {
+    let s = ''
+    let e = ''
+    if (/^\s+/g) {
+      val = val.replace(/^\s+/g,聽(w) => {
+        s = w
+        return ''
+      })
+    }
+    if (/\s+$/g) {
+      val = val.replace(/\s+$/g,聽(w) => {
+        e = w
+        return ''
+      })
+    }
+
+    if (menuDict[val]) {
+      val = menuDict[val]
+    }
+
+    val = s + val + e
+
+    return val
+  }
+
+  let getuuid = () => {
+    let uuid = []
+    let _options = '0123456789abcdefghigklmnopqrstuv'
+    for (let i = 0; i < 19; i++) {
+      uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+    }
+    return uuid.join('')
+  }
+
+  let filterSql = (sl) => {
+    if (!sl) return
+
+    let arr = []
+    
+    sl = sl.replace(/\/\*[^*/]+\*\//g, (word) => {
+      let uuid = getuuid()
+      arr.push({id: `/*${uuid}*/`, value: word})
+      return `/*${uuid}*/`
+    })
+
+    regs.forEach(item => {
+      sl = sl.replace(item.reg, item.value)
+    })
+
+    arr.forEach(item => {
+      sl = sl.replace(item.id, item.value)
+    })
+
+    return sl
+  }
+
+  let filterBtn = (btn) => {
+    if (btn.label) {
+      btn.label = replaceBtn(btn.label)
+    }
+
+    if (!btn.verify) return
+
+    btn.verify.columns && btn.verify.columns.forEach(col => {
+      if (col.Text) {
+        col.Text = replaceTitle(col.Text)
+      }
+    })
+
+    btn.verify.uniques && btn.verify.uniques.forEach(col => {
+      if (col.fieldlabel) {
+        col.fieldlabel = col.fieldlabel.split(',').map(n => replaceTitle(n)).join(',')
+      }
+    })
+    
+    btn.verify.customverifys && btn.verify.customverifys.forEach(script => {
+      script.sql = filterSql(script.sql)
+
+      if (script.errmsg) {
+        script.errmsg = replaceTitle(script.errmsg)
+      }
+    })
+    btn.verify.scripts && btn.verify.scripts.forEach(script => {
+      script.sql = filterSql(script.sql)
+    })
+    btn.verify.cbScripts && btn.verify.cbScripts.forEach(script => {
+      script.sql = filterSql(script.sql)
+    })
+
+    if (btn.OpenType === 'funcbutton') {
+      if (btn.intertype === 'system' && btn.verify.dataType === 'custom' && btn.verify.setting) {
+        btn.verify.setting.dataresource = filterSql(btn.verify.setting.dataresource)
+      }
+    } else if (btn.OpenType === 'excelOut' && btn.verify.dataresource) {
+      btn.verify.dataresource = filterSql(btn.verify.dataresource)
+    }
+  }
+
+  let filterForm = (n) => {
+    if (n.label) {
+      n.label = replaceTitle(n.label)
+    }
+    if (n.resourceType === '1') {
+      n.dataSource = filterSql(n.dataSource)
+    } else if (n.options) {
+      n.options.forEach(o => {
+        if (o.Text) {
+          o.Text = replaceList(o.Text)
+        }
+      })
+    }
+  }
+
+  let traversal = (components) => {
+    if (!components) return
+
+    components.forEach(item => {
+      if (item.type === 'tabs') {
+        item.subtabs.forEach(tab => {
+          if (tab.label) {
+            tab.label = replaceTitle(tab.label)
+          }
+          traversal(tab.components)
+        })
+      } else if (item.type === 'group') {
+        traversal(item.components)
+      } else {
+        if (item.wrap && item.wrap.title) {
+          item.wrap.title = replaceTitle(item.wrap.title)
+        }
+        if (item.plot && item.plot.title) {
+          item.plot.title = replaceTitle(item.plot.title)
+        }
+        if (item.setting && (!item.wrap || !item.wrap.datatype || item.wrap.datatype === 'dynamic')) {
+          if (item.setting.interType === 'system') {
+            item.setting.dataresource = filterSql(item.setting.dataresource)
+            item.scripts && item.scripts.forEach(script => {
+              script.sql = filterSql(script.sql)
+            })
+          }
+          if (item.setting.supModTip) {
+            item.setting.supModTip = replaceTitle(item.setting.supModTip)
+          }
+        }
+
+        if (item.columns) {
+          item.columns.forEach(cell => {
+            if (cell.label) {
+              cell.label = replaceTitle(cell.label)
+            }
+          })
+        }
+        if (item.search) {
+          if (item.type === 'topbar') {
+            if (item.search.fields) {
+              item.search.fields.forEach(cell => {
+                filterForm(cell)
+              })
+            }
+            if (item.search.groups) {
+              item.search.groups.forEach(group => {
+                if (group.fields) {
+                  group.fields.forEach(cell => {
+                    filterForm(cell)
+                  })
+                }
+              })
+            }
+          } else {
+            item.search.forEach(cell => {
+              filterForm(cell)
+            })
+          }
+        }
+        if (item.action) {
+          item.action.forEach(cell => {
+            filterBtn(cell)
+            if (cell.OpenType === 'popview' && cell.config) {
+              traversal(cell.config.components)
+            } else if (cell.OpenType === 'pop') {
+              if (cell.modal && cell.modal.fields.length) {
+                cell.modal.fields.forEach(n => {
+                  filterForm(n)
+                })
+              }
+            }
+          })
+        }
+
+        if (item.type === 'menubar') {
+          item.subMenus = item.subMenus.map(cell => {
+            if (cell.setting.name) {
+              cell.setting.name = replaceMenu(cell.setting.name)
+            }
+            return cell
+          })
+        } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
+          item.subcards.forEach(card => {
+            card.elements && card.elements.forEach(cell => {
+              if (cell.eleType === 'button') {
+                filterBtn(cell)
+                if (cell.OpenType === 'popview' && cell.config) {
+                  traversal(cell.config.components)
+                } else if (cell.OpenType === 'pop') {
+                  if (cell.modal && cell.modal.fields.length) {
+                    cell.modal.fields.forEach(n => {
+                      filterForm(n)
+                    })
+                  }
+                }
+              } else {
+                filterElement(cell)
+              }
+            })
+            card.backElements && card.backElements.forEach(cell => {
+              if (cell.eleType === 'button') {
+                filterBtn(cell)
+                if (cell.OpenType === 'popview' && cell.config) {
+                  traversal(cell.config.components)
+                } else if (cell.OpenType === 'pop') {
+                  if (cell.modal && cell.modal.fields.length) {
+                    cell.modal.fields.forEach(n => {
+                      filterForm(n)
+                    })
+                  }
+                }
+              } else {
+                filterElement(cell)
+              }
+            })
+          })
+        } else if (item.type === 'balcony') {
+          item.elements && item.elements.forEach(cell => {
+            if (cell.eleType === 'button') {
+              filterBtn(cell)
+              if (cell.OpenType === 'popview' && cell.config) {
+                traversal(cell.config.components)
+              } else if (cell.OpenType === 'pop') {
+                if (cell.modal && cell.modal.fields.length) {
+                  cell.modal.fields.forEach(n => {
+                    filterForm(n)
+                  })
+                }
+              }
+            } else {
+              filterElement(cell)
+            }
+          })
+        } else if (item.type === 'table') {
+          let loopCol = (cols) => {
+            cols.forEach(col => {
+              if (col.label) {
+                col.label = replaceTitle(col.label)
+              }
+              if (col.prefix) {
+                col.prefix = replaceTitle(col.prefix)
+              }
+              if (col.postfix) {
+                col.postfix = replaceTitle(col.postfix)
+              }
+              if (col.type === 'colspan') {
+                loopCol(col.subcols)
+              } else if (col.type === 'custom') {
+                col.elements.forEach(cell => {
+                  if (cell.eleType === 'button') {
+                    filterBtn(cell)
+                    if (cell.OpenType === 'popview' && cell.config) {
+                      traversal(cell.config.components)
+                    } else if (cell.OpenType === 'pop') {
+                      if (cell.modal && cell.modal.fields.length) {
+                        cell.modal.fields.forEach(n => {
+                          filterForm(n)
+                        })
+                      }
+                    }
+                  } else {
+                    filterElement(cell)
+                  }
+                })
+              }
+            })
+          }
+          loopCol(item.cols)
+        } else if (item.type === 'form') {
+          item.subcards.forEach(cell => {
+            filterBtn(cell.subButton)
+            cell.fields.forEach(n => {
+              filterForm(n)
+            })
+          })
+        }
+      }
+    })
+  }
+
+  if (config.interfaces) {
+    config.interfaces.forEach(item => {
+      if (item.setting.interType === 'system') {
+        item.setting.dataresource = filterSql(item.setting.dataresource)
+        item.scripts && item.scripts.forEach(script => {
+          script.sql = filterSql(script.sql)
+        })
+      }
+      if (item.setting.supModTip) {
+        item.setting.supModTip = replaceTitle(item.setting.supModTip)
       }
     })
   }
@@ -3084,11 +3794,18 @@
 GOTO_RETURN:
   ROLLBACK TRAN`
 
-  let filterComponent = (components, mainSearch, label = '') => {
+  let filterComponent = (components, mainSearch, label = '', ispop) => {
     components.forEach(item => {
       item.$menuname = (config.MenuName || '') + label + '-' + (item.name || '')
 
       if (item.type === 'tabs') {
+        if (config.Template === 'BaseTable') {
+          item.subtabs.forEach(tab => {
+            if (tab.permission !== 'true' && tab.components[0] && tab.components[0].wrap) {
+              tab.components[0].wrap.permission = 'false'
+            }
+          })
+        }
         item.subtabs.forEach(tab => {
           let _mainSearch = mainSearch || []
 
@@ -3099,10 +3816,11 @@
               _mainSearch = com.search || []
             })
           }
-          filterComponent(tab.components, _mainSearch, label)
+
+          filterComponent(tab.components, _mainSearch, label, ispop)
         })
       } else if (item.type === 'group') {
-        filterComponent(item.components, mainSearch, label)
+        filterComponent(item.components, mainSearch, label, ispop)
       } else {
         if (item.wrap && item.setting) {
           if (item.wrap.datatype === 'public' || item.wrap.datatype === 'static') {
@@ -3140,6 +3858,8 @@
             roleId = ''
           } else if (item.setting.database === 'sso') {
             roleId = ''
+          } else if (ispop) {
+            roleId = ''
           }
 
           sqls.push({uuid: item.uuid, roleId: roleId, type: 'datasource', ...msg})
@@ -3154,7 +3874,7 @@
         item.action && item.action.forEach(cell => {
           if (cell.hidden === 'true') return false
           
-          resetButton(item, cell)
+          resetButton(item, cell, false, ispop)
         })
 
         if (item.type === 'table') {
@@ -3169,7 +3889,7 @@
                 col.elements.forEach(cell => {
                   if (cell.eleType !== 'button' || cell.hidden === 'true') return
                   
-                  resetButton(item, cell)
+                  resetButton(item, cell, false, ispop)
                 })
               } else if (item.subtype === 'editable' && col.editable === 'true') {
                 if (col.editType === 'select' && col.resourceType === '1') {
@@ -3206,7 +3926,7 @@
             card.elements && card.elements.forEach(cell => {
               if (cell.eleType !== 'button' || cell.hidden === 'true') return
               
-              resetButton(item, cell)
+              resetButton(item, cell, false, ispop)
             })
   
             if (!card.backElements || card.backElements.length === 0) return
@@ -3214,14 +3934,14 @@
             card.backElements.forEach(cell => {
               if (cell.eleType !== 'button' || cell.hidden === 'true') return
               
-              resetButton(item, cell, true)
+              resetButton(item, cell, true, ispop)
             })
           })
         } else if (item.type === 'balcony') {
           item.elements.forEach(cell => {
             if (cell.eleType !== 'button' || cell.hidden === 'true') return
             
-            resetButton(item, cell)
+            resetButton(item, cell, false, ispop)
           })
         } else if (item.type === 'form') {
           item.subcards.forEach(group => {
@@ -3234,7 +3954,7 @@
               fields: group.fields
             }
 
-            resetButton(item, group.subButton)
+            resetButton(item, group.subButton, false, ispop)
           })
         } else if (item.type === 'module' && item.subtype === 'invoice') {
           if (item.buyer.setting && item.buyer.setting.interType === 'system') {
@@ -3265,7 +3985,7 @@
     })
   }
 
-  let resetButton = (item, cell, isback) => {
+  let resetButton = (item, cell, isback, ispop) => {
     cell.logLabel = item.$menuname + '-' + cell.label
     let roleId = cell.uuid
     if (item.wrap && item.wrap.permission === 'false') {
@@ -3273,6 +3993,8 @@
     } else if (cell.hidden === 'true' || cell.permission === 'false') {
       roleId = ''
     } else if (cell.database === 'sso') {
+      roleId = ''
+    } else if (ispop) {
       roleId = ''
     }
 
@@ -3319,7 +4041,7 @@
           } else if (form.type === 'popSelect') {
             let msg = getPopSelectSql(form)
         
-            sqls.push({uuid: form.uuid, type: 'popSource', ...msg})
+            sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'popSource', ...msg})
           }
         })
       }
@@ -3362,7 +4084,7 @@
             } else if (form.type === 'popSelect') {
               let msg = getPopSelectSql(form)
           
-              sqls.push({uuid: form.uuid, type: 'popSource', ...msg})
+              sqls.push({uuid: md5(cell.uuid + form.uuid), type: 'popSource', ...msg})
             }
           })
         }
@@ -3402,7 +4124,9 @@
           })
         }
 
-        filterComponent(cell.config.components, _mainSearch, '-' + cell.label)
+        let label = (item.name ? '-' + item.name : '') + '-' + cell.label
+
+        filterComponent(cell.config.components, _mainSearch, label, true)
       }
     }
   }
@@ -3539,6 +4263,11 @@
             isconst: item.constant === 'true'
           }
 
+          if (item.type === 'linkMain' && item.verifyVal === 'true') {
+            _item.$verify = true
+            _item.label = item.label
+          }
+
           if (_item.type === 'datemonth') {
             _item.type = 'text'
           } else if (_item.type === 'number' || _item.type === 'rate') {
@@ -3577,8 +4306,19 @@
       formdata.push(item)
     }
 
+    let verifyValSql = ''
     // 鑾峰彇瀛楁閿�煎
     formdata && formdata.forEach(form => {
+      if (form.$verify) {
+        verifyValSql += `
+        if @${form.key}=${form.type === 'number' ? 0 : `''`}
+        begin
+          select @errorcode='E',@retmsg='${form.label}锛屽叧鑱斾富琛ㄥけ鏁�'
+          goto aaa
+        end
+        `
+      }
+
       let _key = form.key.toLowerCase()
 
       if (!formkeys.includes(_key)) {
@@ -3753,22 +4493,21 @@
     if (formdata && verify.billcodes && verify.billcodes.length > 0) {
       verify.billcodes.forEach(item => {
         let _key = item.field.toLowerCase()
-        let _linkKey = item.linkField ? item.linkField.toLowerCase() : ''
   
         if (!formkeys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
   
         let _lpline = ''
         if (item.TypeCharOne === 'Lp') {
-          if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+          if (/^BID$/ig.test(item.linkField)) {
             _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
           } else {
-            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
+            _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
           }
         } else if (item.TypeCharOne === 'BN') {
-          if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
+          if (/^BID$/ig.test(item.linkField)) {
             _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)`
           } else {
-            _lpline = `set @ModularDetailCode= 'BN'+ right(@${_linkKey},48)`
+            _lpline = `set @ModularDetailCode= 'BN'+ right(@${item.linkField},48)`
           }
         } else {
           _lpline = `set @ModularDetailCode= right('${item.ModularDetailCode}',50)`
@@ -3799,6 +4538,30 @@
   
     // 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
     if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
+      let nFields = []
+      let dataFields = []
+      formdata.forEach(form => {
+        let _key = form.key.toLowerCase()
+        if (form.type === 'number' || form.type === 'rate') {
+          nFields.push(_key)
+        } else if (form.type === 'date') {
+          dataFields.push(_key)
+        }
+      })
+      if (columns && columns.length > 0 && btn.Ot !== 'notRequired') {
+        columns.forEach(col => {
+          let _key = col.field.toLowerCase()
+          if (col.type === 'number') {
+            if (!nFields.includes(_key)) {
+              nFields.push(_key)
+            }
+          } else if (/^date/ig.test(col.datatype)) {
+            if (!dataFields.includes(_key)) {
+              dataFields.push(_key)
+            }
+          }
+        })
+      }
       verify.uniques.forEach(item => {
         let _fieldValue = []                     // 琛ㄥ崟閿�煎field=value
         let _value = []                          // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
@@ -3811,24 +4574,32 @@
           let _val2 = ''
   
           arr.push(_key)
-          if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+          if (_key === 'bid') {
             _val = BID
           } else {
-            _val = `'@mk_${_key}_mk@'`
+            // _val = `'@mk_${_key}_mk@'`
+            _val = `@${_field}`
           }
 
           _fieldValue.push(`${_key}=${_val}`)
 
-          if (_key === 'bid') { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+          if (_key === 'bid') {
             _val2 = `' + ${BID} + '`
           } else {
-            _val2 = `@mk_${_key}_mk@`
+            // _val2 = `@mk_${_key}_mk@`
+            if (nFields.includes(_key)) {
+              _val2 = `' + cast (@${_field} as nvarchar(50)) + '`
+            } else if (dataFields.includes(_key)) {
+              _val2 = `' + CONVERT(nvarchar(50), @${_field}, 23) + '`
+            } else {
+              _val2 = `' + @${_field} + '`
+            }
           }
 
           _value.push(`${_labels[index] || ''}锛�${_val2}`)
         })
   
-        if (!arr.includes(primaryKey.toLowerCase())) {
+        if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
           _fieldValue.push(`${primaryKey} !=${primaryId}`)
         }
   
@@ -3879,15 +4650,20 @@
     let hasvoucher = false
   
     // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
-    if (verify.voucher && verify.voucher.enabled && btn.Ot !== 'requiredOnce') {
+    if (verify.voucher && verify.voucher.enabled) {
       let _voucher = verify.voucher
+      let linkField = `@${_voucher.linkField}`
+  
+      if (/^BID$/ig.test(_voucher.linkField)) {
+        linkField = BID
+      }
   
       hasvoucher = true
   
       _sql += `
         /* 鍒涘缓鍑瘉 */
         exec s_BVoucher_Create
-          @Bill ='0',
+          @Bill = ${linkField},
           @BVoucherType ='${_voucher.BVoucherType}',
           @VoucherTypeOne ='${_voucher.VoucherTypeOne}',
           @VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -4082,7 +4858,9 @@
         _sql += `
           /* 宸ヤ綔娴佸紓甯竤ql */
           if @works_flow_error@ != ''
-          select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          begin
+            select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          end
 
           /* 宸ヤ綔娴侀粯璁ql */
           insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
@@ -4101,7 +4879,9 @@
         _sql += `
           /* 宸ヤ綔娴佸紓甯竤ql */
           if @works_flow_error@ != ''
-          select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          begin
+            select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+          end
 
           if @works_flow_countersign@ = 'Y'
           begin
@@ -4275,6 +5055,10 @@
       }
     } else if (_backCustomScript) {
       _sql += _backCustomScript
+    }
+
+    if (verifyValSql) {
+      _sql += verifyValSql
     }
 
     if (verify.workFlow === 'true' && process) {
@@ -4695,7 +5479,7 @@
         } else if (['mk_address'].includes(s)) {
           decSql.push(`@mk_address nvarchar(100)`)
         } else if (['mk_deleted'].includes(s)) {
-          secSql.push(`@mk_deleted int`)
+          decSql.push(`@mk_deleted int`)
         } else {
           decSql.push(`@${s} nvarchar(50)`)
         }
@@ -4787,7 +5571,7 @@
     let sFields = getSearches(searches)
 
     let _columns = []
-    if (item.subtype === 'dualdatacard') {
+    if (item.subtype === 'dualdatacard' && item.setting.subdata !== 'sub_data_string') {
       _columns = [...item.columns, ...item.subColumns]
     } else if (item.columns) {
       _columns = [...item.columns]
@@ -4820,6 +5604,7 @@
     // }
 
     let _search = ''
+    
     if (item.setting.execute !== 'false') {
       _dataresource = item.setting.dataresource || ''
       _search = '@mk_search@'
@@ -4829,14 +5614,21 @@
       _search = ''
     }
 
+    let custompage = false
+    let testSql = _dataresource + _customScript + _tailScript
+
+    if (/order\s+by\s+sort_id\s*$/i.test(_dataresource)) {
+      custompage = true
+    } else if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql)) {
+      custompage = true
+    }
+
     if (/\s/.test(_dataresource) && !/\)\s+tb$/.test(_dataresource)) {
       _dataresource = '(' + _dataresource + ') tb'
     }
 
     item.setting.dataresource = _dataresource
     item.setting.customScript = _customScript
-
-    let testSql = _dataresource + _customScript + _tailScript
     
     let decSql = [`@ErrorCode nvarchar(50),@retmsg nvarchar(4000)`]
     let secSql = [`@ErrorCode='S',@retmsg =''`]
@@ -4890,12 +5682,12 @@
     let DateCount = ''
     if (_dataresource) {
       /*system_query*/
-      if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql)) {
+      if (custompage || (item.wrap && item.wrap.tree === 'true')) {
         LText = `select ${arr_field} from ${_dataresource} ${_search} `
       } else if (item.setting.laypage === 'true' && item.setting.order) {
         LText = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable where rows > @pageSize@ * (@pageIndex@ - 1) order by tmptable.rows `
         reps.push('pageSize', 'orderBy', 'pageIndex')
-        if (item.subtype === 'dualdatacard') {
+        if (item.subtype === 'dualdatacard' && item.setting.subdata !== 'sub_data_string') {
           DateCount = `select count(1) as total from (select distinct ${item.setting.primaryKey || 'ID'} from ${_dataresource} ${_search})a`
         } else {
           DateCount = `select count(1) as total from ${_dataresource} ${_search}`
@@ -4922,7 +5714,7 @@
     let parid = ''
     let sub_field = ''
 
-    if (item.subtype === 'dualdatacard') {
+    if (item.subtype === 'dualdatacard' && item.setting.subdata !== 'sub_data_string') {
       arr_field = item.columns.map(col => col.field).join(',')
       sub_name = item.setting.subdata
       tabid = item.setting.primaryKey || ''
@@ -5233,7 +6025,9 @@
         sql += `
         /* 宸ヤ綔娴佸紓甯竤ql */
         if @works_flow_error@ != ''
-        select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+        begin
+          select @ErrorCode='E',@retmsg=@works_flow_error@ goto aaa
+        end
 
         /* 宸ヤ綔娴侀粯璁ql */
         insert into s_my_works_flow (works_flow_id,works_flow_code,works_flow_name,works_flow_param,status,statusname,work_group,works_flow_detail_id,work_grade,bid,createuserid,CreateUser,CreateStaff,upid)
@@ -5462,6 +6256,7 @@
         let _fields = unique.field.split(',')
         let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
         _fields_ = _fields_.join(' and ')
+        _fields_ += ` and a.jskey != b.${setting.primaryKey || 'id'}`
 
         let _where = []
         _fields.forEach(f => {
@@ -5518,6 +6313,7 @@
 
     let declarefields = []
     let fields = []
+    let upFields = []
 
     forms.forEach(col => {
       let key = col.field.toLowerCase()
@@ -5525,15 +6321,27 @@
 
       declarefields.push(`${col.field} ${col.datatype}`)
       fields.push(col.field)
+      upFields.push(`${col.field}=t.${col.field}`)
     })
 
     fields = fields.join(',')
+    upFields = upFields.join(',')
 
     let _insert = ''
     if (btn.default !== 'false') {
       _insert = `
         /* 榛樿sql */
-        Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid) 
+        update a set ${upFields},modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname,deleted=0
+        from (select * from #${sheet} where data_type='upt') t
+        inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+        update a set deleted=1,modifydate=getdate(),modifyuserid=@UserID@,modifyuser=@username,modifystaff=@fullname 
+        from (select * from #${sheet} where data_type='del') t
+        inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+        delete t from #${sheet} t inner join ${database}${sheet} a on t.jskey=a.${setting.primaryKey || 'id'}
+
+        Insert into ${database}${sheet} (${fields},createuserid,createuser,createstaff,bid)
         Select ${fields},@UserID@,@username,@fullname,@BID@ From #${sheet}
       `
     }
@@ -6438,5 +7246,32 @@
 
   filterComponent(config.components, _mainSearch)
 
+  let keys = sqls.map(item => item.uuid)
+  if (keys.length > Array.from(new Set(keys)).length) {
+    if (window.backend) {
+      let m = new Map()
+      let n = new Map()
+      sqls.forEach(item => {
+        if (m.has(item.uuid)) {
+          if (!n.has(item.uuid)) {
+            window.mkInfo(m.get(item.uuid))
+            n.set(item.uuid, true)
+          }
+          window.mkInfo(item)
+        } else {
+          m.set(item.uuid, item)
+        }
+      })
+  
+      notification.warning({
+        top: 92,
+        message: '瀛樺湪閲嶅鐨勫悗绔剼鏈琁D锛�',
+        duration: 5
+      })
+    }
+
+    return []
+  }
+
   return sqls
 }
\ No newline at end of file

--
Gitblit v1.8.0