From 5600e49b87c0e689bab9eb8a8d6544f382355006 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 23 Mar 2023 09:31:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10787=E3=80=8110786?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  9 +++++---
 .../rule-engine/Scene/Save/Manual/index.vue   | 19 +++++++++++++++--
 .../rule-engine/Scene/Save/Timer/AddModal.vue |  6 +++---
 .../rule-engine/Scene/Save/Timer/index.vue    | 21 +++++++++++++++++--
 .../Save/components/Timer/WhenOption.vue      |  4 +++-
 .../Scene/Save/components/TriggerWay.vue      | 19 ++++++++++++++---
 src/views/rule-engine/Scene/index.vue         |  2 +-
 vite.config.ts                                |  4 ++--
 8 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 815d1240..1206b11a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,11 @@
 <template>
   <ConfigProvider :locale='zhCN'>
-    <keep-alive>
-      <router-view />
-    </keep-alive>
+<!--    <router-view v-slot="{ Component }">-->
+<!--      <keep-alive>-->
+<!--        <component :is="Component" />-->
+<!--      </keep-alive>-->
+<!--    </router-view>-->
+    <router-view />
   </ConfigProvider>
 </template>
 
diff --git a/src/views/rule-engine/Scene/Save/Manual/index.vue b/src/views/rule-engine/Scene/Save/Manual/index.vue
index 4885ced5..98677d24 100644
--- a/src/views/rule-engine/Scene/Save/Manual/index.vue
+++ b/src/views/rule-engine/Scene/Save/Manual/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class='actions-branches-item'>
+  <div class='manual actions-branches-item'>
     <j-form-item
       :rules="actionRules"
       :name="['branches', 0, 'then']"
@@ -32,6 +32,21 @@ const actionRules = [{
 
 </script>
 
-<style scoped>
+<style scoped lang='less'>
+@minWidth: 75%;
 
+.manual {
+  &.actions-branches-item {
+    width: 100%;
+  }
+}
+
+
+@media (min-width: 1600px) {
+  .manual {
+    &.actions-branches-item {
+      width: @minWidth;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
index cf5afd85..82631c0f 100644
--- a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
@@ -53,9 +53,9 @@ const cancel = () => {
   emit("cancel")
 }
 
-watchEffect(() => {
-  addModel.timer = props.value
-})
+// watchEffect(() => {
+//   addModel.timer = props.value
+// })
 
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue
index 30edd897..81d29554 100644
--- a/src/views/rule-engine/Scene/Save/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/index.vue
@@ -2,7 +2,7 @@
     <div class='timer'>
       <j-form-item
         :rules="rules"
-        name="timer"
+        :name="['trigger', 'timer']"
       >
         <template #label>
           <TitleComponent data='触发规则' style='font-size: 14px;' />
@@ -49,6 +49,7 @@ const visible = ref(false)
 
 const rules = [{
   validator(_: any, v: any) {
+    console.log(v)
     if (!v) {
       return Promise.reject(new Error('请配置定时触发规则'));
     }
@@ -85,5 +86,21 @@ const save = (_data: OperationTimer, options: Record<string, any>) => {
 }
 </script>
 
-<style scoped>
+<style scoped lang='less'>
+@minWidth: 75%;
+
+.timer {
+  .actions-branches-item {
+    width: 100%;
+  }
+}
+
+
+@media (min-width: 1600px) {
+  .timer {
+    .actions-branches-item {
+      width: @minWidth;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
index 3e7782a1..f1adc12b 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
@@ -59,7 +59,9 @@ const allActive = computed(() => {
 watch(() => props.type, () => {
   const isMonth = props.type === 'month'
   const day = isMonth ? 31 : 7
-  change(0)
+  if (!props.value.length) {
+    change(0)
+  }
   timeOptions.value = new Array(day)
     .fill(1)
     .map((_, index) => {
diff --git a/src/views/rule-engine/Scene/Save/components/TriggerWay.vue b/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
index 9f5401cc..a079509b 100644
--- a/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
+++ b/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
@@ -57,15 +57,17 @@ const classNames = computed(() => {
 })
 
 const handleClick = (type: string) => {
-  emit('update:modelValue', type)
+  if (!props.disabled) {
+    emit('update:modelValue', type)
+  }
 }
 
 </script>
 
 <style scoped lang='less'>
-// @import 'ant-design-vue/es/style/themes/default.less';
 
-.scene-trigger-way-warp {display: flex;
+.scene-trigger-way-warp {
+  display: flex;
   flex-wrap: wrap;
   gap: 16px 24px;
   width: 100%;
@@ -115,5 +117,16 @@ const handleClick = (type: string) => {
       }
     }
   }
+
+  &.disabled {
+    color: rgba(#000, .8);
+    .way-item-image {
+      opacity: 0.6;
+    }
+
+    .trigger-way-item {
+      cursor: not-allowed;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index 535e7bf4..92f38c15 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -300,7 +300,7 @@ const getActions = (
     ];
     if (data.triggerType === 'manual') {
         const _item: ActionsType = {
-            key: 'trigger',
+            key: 'tigger',
             text: '手动触发',
             disabled: data.state?.value === 'disable',
             tooltip: {
diff --git a/vite.config.ts b/vite.config.ts
index 3686a5bf..baf145c2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
-                //   target: 'http://120.77.179.54:8844', // 120测试
-                  target: 'http://192.168.33.46:8844', // 本地开发环境
+                  target: 'http://120.77.179.54:8844', // 120测试
+                //   target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')