Merge pull request #3617 from hLinx/hotfix_master

Hotfix master

Author: hLinx

src/frontend/src/components/jb-router-view/guide/corntab-list.vue

@@ -36,11 +36,12 @@
           {{ $t('采用类Unix Crontab的配置表达式风格，降低使用门槛更快上手！提供了执行前/后通知提醒、执行记录等辅助功能，让用户可以放心地把定期执行的任务交给Job！') }}
         </div>
         <div class="page-action">
-          <bk-button
+          <auth-button
+            auth="cron/create"
             theme="primary"
             @click="handleCreateCron">
             {{ $t('新建定时任务') }}
-          </bk-button>
+          </auth-button>
         </div>
       </div>
     </div>

src/frontend/src/views/white-ip/index/components/operation.vue

@@ -103,6 +103,8 @@
   </div>
 </template>
 <script>
+  import _ from 'lodash';
+
   import AppManageService from '@service/app-manage';
   import HostAllManageService from '@service/host-all-manage';
   import WhiteIpService from '@service/white-ip';
@@ -167,7 +169,7 @@
             hostList,
           };
 
-          this.scopeValue = this.formData.scopeList.map(item => `#${item.scopeType}#${item.scopeId}`);
+          this.scopeValue = _.filter(this.formData.scopeList, item => item.scopeType && item.scopeId).map(item => `#${item.scopeType}#${item.scopeId}`);
         },
         immediate: true,
       },