From 972f277c5920d9d38749d675912b47b2b120320e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 五月 2023 10:17:41 +0800
Subject: [PATCH] 2023-05-25

---
 src/menu/components/card/cardcellcomponent/elementform/index.jsx |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 647b4ee..b0620bb 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -173,7 +173,19 @@
       }
 
       if (['text', 'picture'].includes(this.record.eleType) && this.record.link) {
-        _options.push('linkurl', 'joint', 'linkType')
+        _options.push('linkType')
+        if (this.record.linkType === 'linkmenu') {
+          _options.push('open', 'joint')
+          if (this.record.link === 'static') {
+            _options.push('linkmenu')
+          } else {
+            _options.push('linkurl')
+          }
+        } else if (this.record.linkType === 'other') {
+          _options.push('linkurl', 'joint')
+        } else {
+          _options.push('linkurl')
+        }
       } else if (this.record.eleType === 'picture' && !this.record.link) {
         _options.push('scale')
       } else if (this.record.eleType === 'slider') {
@@ -324,7 +336,7 @@
           return item
         })
       })
-    } else if (['datatype', 'showInfo', 'showType', 'fixStyle', 'posterType', 'eval'].includes(key)) {
+    } else if (['datatype', 'showInfo', 'showType', 'fixStyle', 'posterType', 'eval', 'linkType'].includes(key)) {
       let _options = this.getOptions()
 
       this.setState({
@@ -468,8 +480,8 @@
                   getPopupContainer={() => document.getElementById('card-winter')}
                 >
                   {item.options.map((option, index) =>
-                    <Select.Option id={`${index}`} title={option.text} key={`${index}`} value={option.value}>
-                      {option.text}
+                    <Select.Option id={`${index}`} title={option.text || option.label} key={`${index}`} value={option.value}>
+                      {option.text || option.label}
                     </Select.Option>
                   )}
                 </Select>

--
Gitblit v1.8.0