From 01d3a0939d906b84ad7cf07d4351735ead5795a5 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Fri, 24 Mar 2023 13:34:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PermissionButton/index.vue     |  2 +-
 .../Scene/Save/action/Modal/index.vue         | 62 +++++++++----------
 .../Scene/Save/action/Notify/index.vue        |  2 +-
 src/views/system/Department/user/index.vue    | 11 +++-
 yarn.lock                                     |  4 +-
 5 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/src/components/PermissionButton/index.vue b/src/components/PermissionButton/index.vue
index 96af0ee9..979bcd26 100644
--- a/src/components/PermissionButton/index.vue
+++ b/src/components/PermissionButton/index.vue
@@ -1,7 +1,7 @@
 <template>
   <template v-if="isPermission">
     <template v-if="popConfirm">
-      <j-popconfirm v-bind="popConfirm" :disabled="!isPermission || props.disabled">
+      <j-popconfirm :overlayStyle='{minWidth: "180px"}' v-bind="popConfirm" :disabled="!isPermission || props.disabled">
         <j-tooltip v-if="tooltip" v-bind="tooltip">
           <slot v-if="noButton"></slot>
           <j-button v-else v-bind="props" :disabled="_isPermission" :style="props.style">
diff --git a/src/views/rule-engine/Scene/Save/action/Modal/index.vue b/src/views/rule-engine/Scene/Save/action/Modal/index.vue
index 73cee953..d0168055 100644
--- a/src/views/rule-engine/Scene/Save/action/Modal/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Modal/index.vue
@@ -18,7 +18,7 @@
                     },
                 ]"
             >
-                <CardSelect v-model:value="formModel.type" :options="options"/>
+                <CardSelect v-model:value="formModel.type" :options="options.filter(item => !(item.value === 'delay' && parallel))"/>
             </j-form-item>
             <ActionTypeComponent
                 v-bind="props"
@@ -69,36 +69,36 @@ const props = defineProps({
 const emit = defineEmits(['cancel', 'save']);
 
 const options = [
-    {
-        label: '设备输出',
-        value: 'device',
-        iconUrl: getImage('/scene/device-type.png'),
-        subLabel: '配置设备调用功能、读取属性、设置属性规则',
-    },
-    {
-        label: '消息通知',
-        value: 'notify',
-        iconUrl: getImage('/scene/message-type.png'),
-        subLabel: '配置向指定用户发邮件、钉钉、微信、短信等通知',
-    },
-    {
-        label: '延迟执行',
-        value: 'delay',
-        iconUrl: getImage('/scene/delay-type.png'),
-        subLabel: '等待一段时间后，再执行后续动作',
-    },
-    {
-        label: '触发告警',
-        value: 'trigger',
-        iconUrl: getImage('/scene/trigger-type.png'),
-        subLabel: '配置触发告警规则，需配合“告警配置”使用',
-    },
-    {
-        label: '解除告警',
-        value: 'relieve',
-        iconUrl: getImage('/scene/cancel-type.png'),
-        subLabel: '配置解除告警规则，需配合“告警配置”使用',
-    },
+  {
+    label: '设备输出',
+    value: 'device',
+    iconUrl: getImage('/scene/device-type.png'),
+    subLabel: '配置设备调用功能、读取属性、设置属性规则',
+  },
+  {
+    label: '消息通知',
+    value: 'notify',
+    iconUrl: getImage('/scene/message-type.png'),
+    subLabel: '配置向指定用户发邮件、钉钉、微信、短信等通知',
+  },
+  {
+    label: '延迟执行',
+    value: 'delay',
+    iconUrl: getImage('/scene/delay-type.png'),
+    subLabel: '等待一段时间后，再执行后续动作',
+  },
+  {
+    label: '触发告警',
+    value: 'trigger',
+    iconUrl: getImage('/scene/trigger-type.png'),
+    subLabel: '配置触发告警规则，需配合“告警配置”使用',
+  },
+  {
+    label: '解除告警',
+    value: 'relieve',
+    iconUrl: getImage('/scene/cancel-type.png'),
+    subLabel: '配置解除告警规则，需配合“告警配置”使用',
+  },
 ];
 
 const actionForm = ref();
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/index.vue b/src/views/rule-engine/Scene/Save/action/Notify/index.vue
index 2dc92ae1..9e00c129 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/index.vue
@@ -2,7 +2,7 @@
     <j-modal
         title="执行动作"
         visible
-        :width="860"
+        :width="800"
         @cancel="onCancel"
         @ok="onOk"
         :maskClosable="false"
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index 1170e786..6c16fec4 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -3,7 +3,7 @@
         <pro-search
             :columns="columns"
             target="category"
-            @search="(params:any)=>queryParams = {...params}"
+            @search="handleParams"
         />
         <j-pro-table
             ref="tableRef"
@@ -119,8 +119,8 @@ const columns = [
 
     {
         title: '状态',
-        dataIndex: 'state',
-        key: 'state',
+        dataIndex: 'status',
+        key: 'status',
         ellipsis: true,
         fixed: 'left',
         search: {
@@ -149,6 +149,10 @@ const columns = [
 // 搜索参数
 const queryParams = ref({});
 
+const handleParams = (params: any) => {
+  queryParams.value = params
+}
+
 // 表格
 const tableRef = ref<Record<string, any>>({}); // 表格实例
 const table = reactive({
@@ -169,6 +173,7 @@ const table = reactive({
                                 value: props.parentId,
                             },
                         ],
+                      type: 'and'
                     },
                 ],
             };
diff --git a/yarn.lock b/yarn.lock
index 02c7d849..02fe98d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#8cb5c9e68e46e6e7eebc0d96b1cdaab24828779f"
-  integrity sha512-yIbmplK+twekevr7n+dGMvO8tvyIqguC60TWeJCmx2mUqpwv8dEnr/cwwpJee4PBLWohvGPywsYgmm7KxVBbcw==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#f5a8ce70859a9c523b2e50b1e3560ae11c21fd0b"
+  integrity sha512-raeJHyYE2LLa47FhlO3V7P/86+VDhaABlhB2ShJJZGwpR1mRpr+Y/r+iuW2PDsPST7shgk7lb2xsKrzJ8aZN6A==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"