From b99678f96e9884ab1ebba6167fa09c836ed47124 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 18 May 2023 20:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E8=AE=BE=E7=BD=AE=E9=80=89=E4=B8=AD=E6=88=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/WarningSettingController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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')
             ])