From 8d874e27a6b8945d4abd1fdd8def32d3ff0b332f Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Mon, 24 Jul 2023 17:57:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Product/Save/index.vue       |  2 +-
 .../NoticeRule/components/Auth/index.vue      | 21 ++++-
 .../NoticeRule/components/Item/index.vue      | 94 ++++++++++---------
 .../NoticeRule/components/Role/index.vue      |  2 +-
 .../Save/components/NotifyConfig.vue          |  2 +-
 .../Save/components/NotifyTemplate.vue        |  2 +-
 .../components/Save/components/NotifyWay.vue  |  4 +-
 .../NoticeRule/components/Save/index.vue      | 23 +++--
 8 files changed, 92 insertions(+), 58 deletions(-)

diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue
index d8ad9cc1..9d2e7409 100644
--- a/src/views/device/Product/Save/index.vue
+++ b/src/views/device/Product/Save/index.vue
@@ -164,7 +164,7 @@ const deviceList = ref([
         label: '网关子设备',
         value: 'childrenDevice',
         iconUrl: getImage('/device-type-2.png'),
-        tooltip: '作为网关的子设备，有网关代理连接到物联网平台',
+        tooltip: '作为网关的子设备，由网关代理连接到物联网平台',
     },
     {
         label: '网关设备',
diff --git a/src/views/system/NoticeRule/components/Auth/index.vue b/src/views/system/NoticeRule/components/Auth/index.vue
index f987ffb4..5d61cae3 100644
--- a/src/views/system/NoticeRule/components/Auth/index.vue
+++ b/src/views/system/NoticeRule/components/Auth/index.vue
@@ -6,6 +6,10 @@
         @cancel="emit('close')"
         @ok="onSave"
     >
+        <div class="alert">
+            <AIcon type="InfoCircleOutlined" />
+            通过角色控制【{{ name }}】的所有的通知方式可被哪些用户订阅。
+        </div>
         <Role v-model="_selectedRowKeys" :gridColumn="2" />
     </j-modal>
 </template>
@@ -20,6 +24,10 @@ const props = defineProps({
         type: Array as PropType<string[]>,
         default: () => [],
     },
+    name: {
+        type: String,
+        default: ''
+    }
 });
 
 const _selectedRowKeys = ref<string[]>([]);
@@ -31,4 +39,15 @@ watchEffect(() => {
 const onSave = () => {
     emit('save', _selectedRowKeys.value);
 };
-</script>
\ No newline at end of file
+</script>
+
+<style lang="less" scoped>
+.alert {
+    height: 40px;
+    padding: 0 20px 0 10px;
+    margin-bottom: 10px;
+    color: rgba(0, 0, 0, 0.55);
+    line-height: 40px;
+    background-color: #f6f6f6;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/NoticeRule/components/Item/index.vue b/src/views/system/NoticeRule/components/Item/index.vue
index 661ecd06..b4c49b9e 100644
--- a/src/views/system/NoticeRule/components/Item/index.vue
+++ b/src/views/system/NoticeRule/components/Item/index.vue
@@ -22,7 +22,7 @@
                         <template #title>
                             <span v-if="!update">暂无权限，请联系管理员</span>
                             <div v-else>
-                                用于配制外层权限<br />未配置外层权限将执行通知方式中配置的权限<br />配置外层权限后将覆盖所有通知方式中配置的权限
+                                通过角色控制【{{ data.name }}】的所有的通知方式可被哪些用户订阅。
                             </div>
                         </template>
                         <j-button
@@ -129,6 +129,7 @@
         @save="onSave"
         :loading="loading"
         :provider="provider"
+        :name="data.name"
     />
     <Detail
         :data="current"
@@ -140,6 +141,7 @@
         :data="data?.grant?.role?.idList"
         @close="authVisible = false"
         @save="onAuthSave"
+        :name="data.name"
     />
 </template>
 
@@ -346,49 +348,53 @@ const onSwitchChange = (e: boolean) => {
     if (_checked) {
         onAction(e);
     } else {
-        Modal.confirm({
-            title: e
-                ? '开启后默认平台所有用户都能接收到该通知'
-                : '关闭后平台所有用户都不能接收到该通知',
-            cancelText: '取消',
-            okText: e ? '确认开启' : '确认关闭',
-            content: h(
-                'div',
-                {
-                    style: {
-                        display: 'flex',
-                        justifyContent: 'flex-end',
-                        marginTop: '20px',
-                    },
-                },
-                [
-                    h(
-                        Checkbox,
-                        {
-                            onChange: (_e: any) => {
-                                LocalStore.set(
-                                    user.userInfos?.username,
-                                    e
-                                        ? {
-                                              ..._value,
-                                              open: _e.target?.checked,
-                                          }
-                                        : {
-                                              ..._value,
-                                              close: _e.target?.checked,
-                                          },
-                                );
-                            },
+        if (e) {
+            onAction(e);
+        } else {
+            Modal.confirm({
+                title: e
+                    ? '开启后默认平台所有用户都能接收到该通知'
+                    : '关闭后平台所有用户都不能接收到该通知',
+                cancelText: '取消',
+                okText: e ? '确认开启' : '确认关闭',
+                content: h(
+                    'div',
+                    {
+                        style: {
+                            display: 'flex',
+                            justifyContent: 'flex-end',
+                            marginTop: '20px',
                         },
-                        '不再提示',
-                    ),
-                ],
-            ),
-            onOk() {
-                onAction(e);
-            },
-            onCancel() {},
-        });
+                    },
+                    [
+                        h(
+                            Checkbox,
+                            {
+                                onChange: (_e: any) => {
+                                    LocalStore.set(
+                                        user.userInfos?.username,
+                                        e
+                                            ? {
+                                                  ..._value,
+                                                  open: _e.target?.checked,
+                                              }
+                                            : {
+                                                  ..._value,
+                                                  close: _e.target?.checked,
+                                              },
+                                    );
+                                },
+                            },
+                            '不再提示',
+                        ),
+                    ],
+                ),
+                onOk() {
+                    onAction(e);
+                },
+                onCancel() {},
+            });
+        }
     }
 };
 
@@ -489,7 +495,7 @@ const onSave = (_data: any) => {
 
         .box-item-add {
             cursor: pointer;
-            background-color: #F7F8FA;
+            background-color: #f7f8fa;
             width: 54px;
             height: 54px;
             display: flex;
diff --git a/src/views/system/NoticeRule/components/Role/index.vue b/src/views/system/NoticeRule/components/Role/index.vue
index 4b1010af..7188b5ed 100644
--- a/src/views/system/NoticeRule/components/Role/index.vue
+++ b/src/views/system/NoticeRule/components/Role/index.vue
@@ -70,7 +70,7 @@
                 </j-alert>
             </div>
         </template>
-        <j-scrollbar height="400px">
+        <j-scrollbar :height="gridColumn <= 2 ? '320px' : '250px'">
             <j-pro-table
                 ref="tableRef"
                 :columns="columns"
diff --git a/src/views/system/NoticeRule/components/Save/components/NotifyConfig.vue b/src/views/system/NoticeRule/components/Save/components/NotifyConfig.vue
index eb1c7e3e..5d575424 100644
--- a/src/views/system/NoticeRule/components/Save/components/NotifyConfig.vue
+++ b/src/views/system/NoticeRule/components/Save/components/NotifyConfig.vue
@@ -20,7 +20,7 @@
         <AIcon type="InfoCircleOutlined" />
         钉钉群机器人类型的配置在当前页面将被过滤
     </div>
-    <div style="height: 400px; overflow-y: auto">
+    <div style="max-height: 400px; overflow-y: auto">
         <JProTable
             :columns="columns"
             :request="query"
diff --git a/src/views/system/NoticeRule/components/Save/components/NotifyTemplate.vue b/src/views/system/NoticeRule/components/Save/components/NotifyTemplate.vue
index 83a0b9af..22db2459 100644
--- a/src/views/system/NoticeRule/components/Save/components/NotifyTemplate.vue
+++ b/src/views/system/NoticeRule/components/Save/components/NotifyTemplate.vue
@@ -19,7 +19,7 @@
         <AIcon type="InfoCircleOutlined" />
         已规定固定收信人的模板在当前页面将被过滤
     </div>
-    <div style="height: 400px; overflow-y: auto">
+    <div style="max-height: 400px; overflow-y: auto">
         <JProTable
             :columns="columns"
             :request="(e) => handleData(e)"
diff --git a/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue b/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue
index cdcf1f40..f18d9397 100644
--- a/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue
+++ b/src/views/system/NoticeRule/components/Save/components/NotifyWay.vue
@@ -69,10 +69,12 @@ onMounted(() => {
                     iconUrl: iconMap.get(item.id),
                 };
             });
+            emit('update:value', options.value?.[0]?.value);
+            emit('update:name', options.value?.[0]?.label);
+            emit('change', {label: options.value?.[0]?.label, value: options.value?.[0]?.value});
         }
         loading.value = false;
     });
-    notifyType.value = props.value;
 });
 </script>
 
diff --git a/src/views/system/NoticeRule/components/Save/index.vue b/src/views/system/NoticeRule/components/Save/index.vue
index a4c3d280..fca7e00c 100644
--- a/src/views/system/NoticeRule/components/Save/index.vue
+++ b/src/views/system/NoticeRule/components/Save/index.vue
@@ -11,11 +11,12 @@
                 <j-step v-for="(item, index) in stepList" :key="item">
                     <template #title>
                         {{ item
-                        }}<j-tooltip
-                            v-if="index === 4"
-                            >
+                        }}<j-tooltip v-if="index === 4">
                             <template #title>
-                                <span>内层权限配置<br />外层权限已配置的情况下，将取外层权限与当前页面分配权限的交集，向对应角色发送通知。<br />外层权限未配置的情况下，将按此处配置的权限发送通知。</span>
+                                <span>
+                                    通过角色控制【{{ name }}】下的【{{ showName }}通知】可被哪些用户订阅。<br />
+                                    注意：当前配置会被外层【{{ name }}】中的权限控制覆盖。
+                                </span>
                             </template>
                             <AIcon type="QuestionCircleOutlined"
                         /></j-tooltip>
@@ -32,6 +33,7 @@
             <template v-if="current === 0">
                 <NotifyWay
                     :value="formModel.channelProvider"
+                    v-model:name="showName"
                     @change="onWayChange"
                 />
             </template>
@@ -161,6 +163,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    name: {
+        type: String,
+        default: '',
+    },
 });
 
 const stepList = [
@@ -190,14 +196,15 @@ const formModel = reactive<{
 });
 const variableRef = ref();
 const formRef = ref();
+const showName = ref<string>('钉钉')
 
 const _getType = computed(() => {
-    if(['notifier-dingTalk'].includes(props.data?.channelProvider)) {
-        return ['user', 'tag']
+    if (['notifier-dingTalk'].includes(props.data?.channelProvider)) {
+        return ['user', 'tag'];
     } else {
-        return ['user', 'org', 'tag']
+        return ['user', 'org', 'tag'];
     }
-})
+});
 
 const _variableDefinitions = computed(() => {
     return variable.value.filter((item: any) => {