fix: fix the bug when the props are null (#390)

apache · Jan 11, 2024 · 17eb084 · 17eb084
1 parent b709682
commit 17eb084
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/routes/Plugin/Common/Rule.js b/src/routes/Plugin/Common/Rule.js
@@ -541,7 +541,7 @@ class AddModal extends Component {
               <strong>*</strong>
               {getIntlContent("SHENYU.COMMON.CONDITION")}:
             </h3>
-            <div className={styles.content}>
+            <div className={styles.content} style={{ marginLeft: '2%' }}>
               {ruleConditions.map((item, index) => {
                 return (
                   <ul key={index}>

diff --git a/src/routes/Plugin/Common/index.js b/src/routes/Plugin/Common/index.js
@@ -380,11 +380,11 @@ export default class Common extends Component {
       callback: selector => {
        if ( isDiscovery ){
         let discoveryConfig = {
-          props: selector.discoveryVO ? selector.discoveryVO.props: "{}",
-          discoveryType: selector.discoveryVO ? selector.discoveryVO.type: 'local',
-          serverList: selector.discoveryVO ? selector.discoveryVO.serverList: '',
-          handler: selector.discoveryHandler ? selector.discoveryHandler.handler: "{}",
-          listenerNode: selector.discoveryHandler ? selector.discoveryHandler.listenerNode : '',
+          props: selector.discoveryVO && selector.discoveryVO.props ? selector.discoveryVO.props: "{}",
+          discoveryType: selector.discoveryVO && selector.discoveryVO.type ? selector.discoveryVO.type: 'local',
+          serverList: selector.discoveryVO && selector.discoveryVO.serverList ? selector.discoveryVO.serverList: '',
+          handler: selector.discoveryHandler && selector.discoveryHandler.handler ? selector.discoveryHandler.handler: "{}",
+          listenerNode: selector.discoveryHandler && selector.discoveryHandler.listenerNode ? selector.discoveryHandler.listenerNode : '',
         }
         let updateArray = [];
         if (selector.discoveryUpstreams) {