diff --git a/app/Admin/Controllers/WarningSettingController.php b/app/Admin/Controllers/WarningSettingController.php index 5355f93..857c1a0 100644 --- a/app/Admin/Controllers/WarningSettingController.php +++ b/app/Admin/Controllers/WarningSettingController.php @@ -45,6 +45,8 @@ class WarningSettingController extends AdminController public function modeForm($type) { + //获取当前已设置警报内容 + $formBody = $fields = []; foreach(MonitorMode::fieldMap($type) as $field => $fieldName){ $fields[] = [ @@ -54,10 +56,12 @@ class WarningSettingController extends AdminController } foreach(WarningNotice::lvMap() as $lv => $lvName){ + $formData[str($lv).'.conjunction'] = 'or'; $formBody[] = amisMake()->ConditionBuilderControl(str($lv), $lvName)->fields( $fields); } - - return \amisMake()->Form()->title('')->body(array_merge($formBody, [ + return \amisMake()->Form() + ->data($formData) + ->title('')->body(array_merge($formBody, [ amisMake()->TextControl('type', '类别')->value($type)->hidden(true), amis('submit')->label(__('admin.save'))->level('primary') ])