From e1dbc27fbe3f083322f87fc46070191c619c5199 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 八月 2023 20:31:06 +0800
Subject: [PATCH] 2023-08-07

---
 src/menu/components/share/actioncomponent/actionform/index.jsx |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 1f430f5..bcba0e8 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -20,7 +20,7 @@
   excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'],
   excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'],
   popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'],
-  tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden'],
+  tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden', 'openTab'],
   innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
   funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
   form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'refreshTab', 'title', 'hidden']
@@ -166,7 +166,7 @@
       reOptions.intertype = this.state.interTypeOptions
 
       if (intertype === 'custom') {
-        shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
+        shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType', 'outerBlacklist')
         if (this.record.procMode === 'system') {
           shows.push('sql', 'sqlType')
         } else if (this.record.procMode === 'inner') {
@@ -388,6 +388,8 @@
         shows.push('placement')
       } else if (this.record.display === 'drawer') {
         shows.push('placement')
+      } else if (this.record.display === 'modal') {
+        shows.push('popshow')
       }
       if (this.record.popClose === 'grid') {
         shows.push('resetPageIndex')
@@ -401,7 +403,7 @@
       reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
 
       if (this.record.pageTemplate === 'custom') {
-        shows.push('url', 'joint', 'open')
+        shows.push('url', 'proUrl', 'joint', 'open')
       } else if (this.record.pageTemplate === 'linkpage') {
         shows.push('linkmenu', 'open')
 
@@ -413,7 +415,7 @@
         reTooltip.linkmenu = ''
       } else if (this.record.pageTemplate === 'billprint') {
         shows.push('printTemp')
-        reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
+        reOptions.Ot = requireOptions
       } else if (this.record.pageTemplate === 'pay') {
         reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
       }
@@ -496,7 +498,7 @@
     }
     
     if (appType === 'mob') {
-      if (Ot !== 'notRequired' && openType !== 'excelOut') {
+      if (openType !== 'excelOut') {
         shows.push('control')
         reOptions.control = [
           { value: '', text: '鏃�' },
@@ -511,7 +513,7 @@
         }
       }
     } else {
-      if (Ot !== 'notRequired' && openType !== 'excelOut') {
+      if (openType !== 'excelOut') {
         reOptions.control = [
           { value: '', text: '鏃�' },
           { value: 'disabled', text: '绂佺敤' },
@@ -798,6 +800,10 @@
             { pattern: formRule.func.pattern, message: formRule.func.message },
             { max: formRule.func.max, message: formRule.func.maxMessage }
           )
+        } else if (item.key === 'outerBlacklist') {
+          rules.push(
+            { max: 512, message: '鏈�澶�512涓瓧绗�' }
+          )
         } else if (item.key === 'output') {
           if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
             rules = [{
@@ -906,6 +912,13 @@
           { required: item.readonly ? false : item.required, message: '璇疯緭鍏�' + item.label + '!' }
         ]
 
+        if (item.key === 'url' || item.key === 'proUrl') {
+          rules.push({
+            pattern: /^[^\s]*$/,
+            message: '鍦板潃涓笉鍙娇鐢ㄧ┖鏍硷紒'
+          })
+        }
+
         content = <TextArea rows={2} readOnly={item.readonly}/>
       } else if (item.type === 'keyinterface') {
         span = 24
@@ -957,6 +970,7 @@
           values.verify = card.verify || null
           values.modal = card.modal || null
           values.config = card.config || null
+          values.$fixed = card.$fixed || false
 
           if (card.OpenType === 'excelOut' && values.OpenType === 'excelIn') {
             if (values.verify && values.verify.columns && values.verify.columns.length > 0) {
@@ -1055,6 +1069,10 @@
               })
             }
           }
+          
+          if (values.outerBlacklist) {
+            values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
+          }
 
           if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
             let list = null

--
Gitblit v1.8.0