From 0dc60d125f588182b2a0d3eb6e996b4aba5e7ca1 Mon Sep 17 00:00:00 2001
From: qiaochuLei <124648559+qiaochuLei@users.noreply.github.com>
Date: Fri, 8 Sep 2023 10:12:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20bug#18002=E3=80=8117889=E3=80=811766?=
 =?UTF-8?q?5=E3=80=8117684?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: bug#17781、17791、17847、17849、17666、17667、17670

* fix: bug#17617

* fix: bug#17665、17684

* fix: bug#17889

* fix: bug#18002
---
 src/api/account/center.ts                     |   2 +-
 src/api/device/instance.ts                    |   7 +-
 .../ChildDevice/EdgeMap/PatchMapping.vue      |   4 +
 .../Detail/ChildDevice/EdgeMap/index.vue      |   4 +-
 .../Instance/Detail/ChildDevice/index.vue     |  10 +-
 .../device/Instance/Detail/EdgeMap/index.vue  |  10 +-
 .../Metadata/Base/components/Source.vue       |  36 +-
 src/views/edge/Device/index.vue               |   6 +-
 src/views/link/Type/Detail/index.vue          |  19 +-
 src/views/media/Device/Channel/Live/index.vue |   2 +-
 .../system/DataSource/Management/index.vue    | 339 +++++++++---------
 .../NoticeRule/components/Auth/index.vue      |   2 +-
 .../NoticeRule/components/Save/index.vue      |   2 +-
 src/views/user/Login/index.vue                |   4 +-
 14 files changed, 260 insertions(+), 187 deletions(-)

diff --git a/src/api/account/center.ts b/src/api/account/center.ts
index 5fa615d8..046d5715 100644
--- a/src/api/account/center.ts
+++ b/src/api/account/center.ts
@@ -10,7 +10,7 @@ export const updateMeInfo_api = (data:object) => server.put(`/user/detail`,data)
 // 修改登录用户密码
 export const updateMepsd_api = (data:object) => server.put(`/user/passwd`,data);
 // 第三方账号解绑
-export const unBind_api = (appId: string) => server.post(`/application/sso/${appId}/unbind/me`);
+export const unBind_api = (appId: string) => server.post(`/application/sso/${appId}/unbind/me`,[]);
 /**
  * 校验字段合法性
  * @param type 类型
diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts
index 70e08c3f..f45325d3 100644
--- a/src/api/device/instance.ts
+++ b/src/api/device/instance.ts
@@ -270,6 +270,11 @@ export const queryDeviceMapping = (deviceId: string, data?: any) => server.post(
  */
 export const saveDeviceMapping = (deviceId: string, data: any) => server.post(`/edge/operations/${deviceId}/device-mapping-save-batch/invoke`, data)
 
+/**
+ *批量删除云端映射设备 
+ */
+export const deleteDeviceMapping = (deviceId: string, data:any) => server.post(`/edge/operations/${deviceId}/device-mapping-delete/invoke`, data)
+
 /**
  * 获取产品列表
  * @param data
@@ -279,7 +284,7 @@ export const getProductListNoPage = (data: any) => server.post('/device/product/
 /**
  * 修改设备
  */
-export const editDevice = (parmas: any) => server.patch('/device-instance', parmas)
+export const editDevice = (params: any) => server.patch('/device-instance', params)
 
 /**
  * 新增设备
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
index 646a51db..65185c46 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
@@ -5,6 +5,7 @@
         visible
         @ok="handleClick"
         @cancel="handleClose"
+        :confirmLoading="confirmLoading"
     >
         <div class="map-tree">
             <div class="map-tree-top">
@@ -99,6 +100,7 @@ const rightList = ref<any[]>([]);
 const dataSource = ref<any[]>([]);
 const loading = ref<boolean>(false);
 
+const confirmLoading = ref(false)
 const handleData = (data: any[], type: string) => {
     data.forEach((item) => {
         item.key = item.id;
@@ -212,6 +214,7 @@ const _delete = (_key: string) => {
 };
 
 const handleClick = async () => {
+    confirmLoading.value = true
     if (!rightList.value.length) {
         onlyMessage('请选择采集器', 'warning');
     } else {
@@ -271,6 +274,7 @@ const handleClick = async () => {
             }
         }
     }
+    confirmLoading.value = false
 };
 const handleClose = () => {
     _emits('close');
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
index c4706a81..7ff0b929 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
@@ -280,7 +280,9 @@ const onSave = async () => {
                         { deviceId: resq.result?.id, deviceName: formData.name }
                       ]
                     }
-                    const res = await saveDeviceMapping(instanceStore.current.id, params)
+                    if(!instanceStore.current.parentId){
+                        const res = await saveDeviceMapping(instanceStore.current.id, params)
+                    }
                     const submitData = {
                         deviceId: instanceStore.current.parentId
                             ? instanceStore.current.parentId
diff --git a/src/views/device/Instance/Detail/ChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/index.vue
index 08f86b11..6ebb1c19 100644
--- a/src/views/device/Instance/Detail/ChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/index.vue
@@ -113,7 +113,7 @@
 <script setup lang="ts">
 import moment from 'moment';
 import type { ActionsType } from '@/components/Table';
-import {query, unbindDevice, unbindBatchDevice, queryByParent} from '@/api/device/instance';
+import {query, unbindDevice, unbindBatchDevice, queryByParent , deleteDeviceMapping} from '@/api/device/instance';
 import { useInstanceStore } from '@/store/instance';
 import { storeToRefs } from 'pinia';
 import BindChildDevice from './BindChildDevice/index.vue';
@@ -241,6 +241,10 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                         data.id,
                         {},
                     );
+                    const res = await deleteDeviceMapping(
+                        detail.value.id,
+                        {ids:[data.id]}
+                    )
                     if (resp.status === 200) {
                         childDeviceRef.value?.reload();
                         onlyMessage('操作成功！');
@@ -282,6 +286,10 @@ const handleUnBind = async () => {
             _selectedRowKeys.value,
         );
         if (resp.status === 200) {
+            const res = await deleteDeviceMapping(
+                detail.value.id,
+                {ids:[_selectedRowKeys.value]}
+            )
             onlyMessage('操作成功！');
             cancelSelect();
             childDeviceRef.value?.reload();
diff --git a/src/views/device/Instance/Detail/EdgeMap/index.vue b/src/views/device/Instance/Detail/EdgeMap/index.vue
index 8c445b33..5c22dc13 100644
--- a/src/views/device/Instance/Detail/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/index.vue
@@ -210,7 +210,6 @@ import PatchMapping from './PatchMapping.vue';
 import { onlyMessage } from '@/utils/comm';
 import { cloneDeep } from 'lodash-es';
 import { usePermissionStore } from '@/store/permission';
-
 const columns = [
     {
         title: '名称',
@@ -313,6 +312,14 @@ const handleSearch = async (_array: any[]) => {
               Object.assign(item, metadataId);
               return item
             })
+            resp.result?.[0].forEach((item:any)=>{
+               const differ = array.every((i:any)=>{
+                   return item.metadataId !== i.metadataId
+                })
+                if(!differ){
+                    array.push(item)
+                }
+            })
             // const array = resp.result?.[0].reduce((x: any, y: any) => {
             //     const metadataId = _metadata.find(
             //         (item: any) => item.metadataId === y.metadataId,
@@ -324,6 +331,7 @@ const handleSearch = async (_array: any[]) => {
             //     }
             //     return x;
             // }, _metadata);
+            console.log(array)
             modelRef.dataSource = array;
         }
     }
diff --git a/src/views/device/components/Metadata/Base/components/Source.vue b/src/views/device/components/Metadata/Base/components/Source.vue
index 12727da7..fc892971 100644
--- a/src/views/device/components/Metadata/Base/components/Source.vue
+++ b/src/views/device/components/Metadata/Base/components/Source.vue
@@ -37,7 +37,7 @@
                 <AIcon type="EditOutlined" />
             </j-button>
         </j-popconfirm-modal>
-        <j-dropdown v-if="myValue === 'rule' && target === 'device' && showReset" :getPopupContainer="(triggerNode) => triggerNode.parentNode">
+        <j-dropdown v-if="myValue === 'rule' && target === 'device' && showReset" :getPopupContainer="(node) => fullRef || node" placement="bottom">
             <span style="width: 20px;" @click.prevent>
                 <AIcon type="MoreOutlined" />
             </span>
@@ -100,7 +100,13 @@ import { resetRule } from '@/api/device/instance';
 import { updata } from '@/api/rule-engine/configuration';
 import { onlyMessage } from '@/utils/comm';
 import { provide } from 'vue';
+import { queryDeviceVirtualProperty } from '@/api/device/instance';
+import {
+    queryProductVirtualProperty
+} from '@/api/device/product';
+import { useProductStore } from '@/store/product';
 const instanceStore = useInstanceStore();
+const productStore = useProductStore();
 const PropertySource: { label: string; value: string }[] = isNoCommunity
     ? [
           {
@@ -133,6 +139,7 @@ type Emit = {
     (e: 'update:value', data: Record<string, any>): void;
 };
 
+
 const fullRef = inject(FULL_CODE);
 const showReset = ref(false);
 const props = defineProps({
@@ -243,6 +250,32 @@ const cancel = () => {
         type.value = props.value?.expands?.type || [];
 }
 
+const handleSearch = async () => {
+    let resp: any = undefined;
+      if (props.target === 'product') {
+        resp = await queryProductVirtualProperty(
+            productStore.current?.id,
+            props.value?.id,
+        );
+      } else {
+        resp = await queryDeviceVirtualProperty(
+            instanceStore.current?.productId,
+            instanceStore.current?.id,
+            props.value?.id,
+        );
+      }
+      if (resp && resp.status === 200 && resp.result) {
+        const _triggerProperties = props.value?.expands?.virtualRule?.triggerProperties?.length ? props.value?.expands?.virtualRule?.triggerProperties : resp.result.triggerProperties
+            updateValue({
+                    source: myValue.value,
+                    virtualRule:{
+                    triggerProperties: _triggerProperties?.length ? _triggerProperties : ['*'],
+                    ...resp.result.rule
+                }             
+        });
+      }
+};
+
 watch(
     () => props.value,
     () => {
@@ -261,6 +294,7 @@ onMounted(()=>{
         item === props.value?.id ? showReset.value = true : ''
     })
     }
+    handleSearch()
 })
 </script>
 
diff --git a/src/views/edge/Device/index.vue b/src/views/edge/Device/index.vue
index f6389dee..e6abbfaa 100644
--- a/src/views/edge/Device/index.vue
+++ b/src/views/edge/Device/index.vue
@@ -43,6 +43,7 @@
                         :actions="getActions(slotProps, 'card')"
                         :status="slotProps.state?.value"
                         :statusText="slotProps.state?.text"
+                        @click="handleView(slotProps.id)"
                         :statusNames="{
                             online: 'processing',
                             offline: 'error',
@@ -63,7 +64,6 @@
                             <Ellipsis style="width: calc(100% - 100px)">
                                 <span
                                     style="font-size: 16px; font-weight: 600"
-                                    @click.stop="handleView(slotProps.id)"
                                 >
                                     {{ slotProps.name }}
                                 </span>
@@ -101,7 +101,7 @@
                                             :key="i"
                                         >
                                             <PermissionButton
-                                                :disabled="o.disabled"
+                                                :disabled="o.disabled || item.state !== 'online'"
                                                 :popConfirm="o.popConfirm"
                                                 :tooltip="{
                                                     ...o.tooltip,
@@ -470,7 +470,7 @@ const getActions = (
             },
             icon: 'RedoOutlined',
             popConfirm: {
-                title: '确认重置密码为P@ssw0rd？',
+                title: '确认重置密码为Jetlinks123？',
                 onConfirm: async () => {
                     restPassword(data.id).then((resp: any) => {
                         if (resp.status === 200) {
diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index 6b80ce67..cd8aefb9 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -283,6 +283,11 @@
                                                             cluster
                                                                 .configuration
                                                                 .port
+                                                        "
+                                                         :options="
+                                                            portOptionsIndex[
+                                                                index
+                                                            ]
                                                         "
                                                         placeholder="请选择本地端口"
                                                         allowClear
@@ -291,7 +296,7 @@
                                                             filterPortOption
                                                         "
                                                     >
-                                                      <j-select-option
+                                                      <!-- <j-select-option
                                                           v-for="i in getPortList( portOptionsIndex[
                                                                 index
                                                             ], cluster
@@ -300,7 +305,7 @@
                                                         :value="i.value"
                                                       >
                                                         {{ i.label }}
-                                                      </j-select-option>
+                                                      </j-select-option> -->
                                                     </j-select>
                                                 </j-form-item>
                                             </j-col>
@@ -1231,11 +1236,11 @@ const filterPortOption = (input: string, option: any) => {
     return JSON.stringify(option.label).indexOf(input) >= 0;
 };
 
-const getPortList = (list: any[], id: string) => {
-  const keys = dynamicValidateForm?.cluster?.map?.(item => item.configuration?.port) || []
-//   console.log(dynamicValidateForm?.cluster, id, keys)
-  return (list || []).filter(item => item.value === id || !keys.includes(item.value) )
-}
+// const getPortList = (list: any[], id: string) => {
+//   const keys = dynamicValidateForm?.cluster?.map?.(item => item.configuration?.port) || []
+// //   console.log(dynamicValidateForm?.cluster, id, keys)
+//   return (list || []).filter(item => item.value === id || !keys.includes(item.value) )
+// }
 
 const filterConfigByType = (data: any[], type: string) => {
     let _temp = type;
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index 956070ca..91a2d394 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -130,7 +130,7 @@
                         </template>
                     </MediaTool>
                 </div>
-                <Preset :data="data" @refresh="onRefresh" />
+                <Preset  v-if='data.ptzType.value ===0 || data.ptzType.value === 1' :data="data" @refresh="onRefresh" />
             </div>
         </div>
         <template #footer>
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index 2fdba79b..999784d8 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -1,176 +1,180 @@
 <template>
     <page-container>
-        <div class="manager-container">
-            <div class="left">
-                <j-input-search
-                    v-model:value="leftData.searchValue"
-                    placeholder="请输入"
-                    style="margin-bottom: 24px"
-                />
-                <!-- 使用v-if用于解决异步加载数据后不展开的问题 -->
-                <j-tree
-                    v-if="leftData.treeData.length > 0"
-                    defaultExpandAll
-                    :tree-data="leftData.treeData"
-                    v-model:selectedKeys="leftData.selectedKeys"
-                    @select="onSelect"
-                    :showLine="{ showLeafIcon: false }"
-                    :show-icon="true"
-                >
-                    <template #title="{ dataRef }">
-                        <div
-                            v-if="dataRef.root"
-                            style="
-                                justify-content: space-between;
-                                display: flex;
-                                align-items: center;
-                                width: 200px;
-                            "
-                        >
-                            <span>
-                                {{ dataRef.title }}
-                            </span>
-                            <AIcon
-                                type="PlusOutlined"
-                                style="color: #1d39c4"
-                                @click="addTable"
-                            />
-                        </div>
-                        <span v-else>
-                            {{ dataRef.title }}
-                        </span>
-                    </template>
-                </j-tree>
-            </div>
-            <div class="right">
-                <div class="btns">
-                    <j-button type="primary" @click="clickSave">保存</j-button>
-                </div>
-                <j-form ref="formRef" :model="table">
-                    <j-table
-                        :columns="columns"
-                        :dataSource="table.data"
-                        :pagination="false"
-                        :scroll="{ y: 500 }"
+        <FullPage>
+            <div class="manager-container">
+                <div class="left">
+                    <j-input-search
+                        v-model:value="leftData.searchValue"
+                        placeholder="请输入"
+                        style="margin-bottom: 24px"
+                    />
+                    <!-- 使用v-if用于解决异步加载数据后不展开的问题 -->
+                    <j-tree
+                        v-if="leftData.treeData.length > 0"
+                        defaultExpandAll
+                        :tree-data="leftData.treeData"
+                        v-model:selectedKeys="leftData.selectedKeys"
+                        @select="onSelect"
+                        :showLine="{ showLeafIcon: false }"
+                        :show-icon="true"
                     >
-                        <template #bodyCell="{ column, record, index }">
-                            <template v-if="column.key === 'name'">
-                                <j-form-item
-                                    :name="['data', index, 'name']"
-                                    :rules="[
-                                        {
-                                            max: 64,
-                                            message: '最多可输入64个字符',
-                                        },
-                                        {
-                                            required: true,
-                                            message: '请输入名称',
-                                        },
-                                    ]"
+                        <template #title="{ dataRef }">
+                            <Ellipsis>
+                                <div
+                                    v-if="dataRef.root"
+                                    style="
+                                        justify-content: space-between;
+                                        display: flex;
+                                        align-items: center;
+                                        width: 200px;
+                                    "
                                 >
-                                    <j-input
-                                        :disabled="record.old_id"
-                                        v-model:value="record.name"
-                                        placeholder="请输入名称"
+                                    <span>
+                                        {{ dataRef.title }}
+                                    </span>
+                                    <AIcon
+                                        type="PlusOutlined"
+                                        style="color: #1d39c4"
+                                        @click="addTable"
                                     />
-                                </j-form-item>
-                            </template>
-                            <template v-else-if="column.key === 'type'">
-                                <j-form-item
-                                    :name="['data', index, 'type']"
-                                    :rules="[
-                                        {
-                                            max: 64,
-                                            message: '最多可输入64个字符',
-                                        },
-                                        {
-                                            required: true,
-                                            message: '请输入类型',
-                                        },
-                                    ]"
-                                >
-                                    <j-input
-                                        v-model:value="record.type"
-                                        placeholder="请输入类型"
-                                    />
-                                </j-form-item>
-                            </template>
-                            <template v-else-if="column.key === 'length'">
-                                <j-form-item :name="['data', index, 'length']">
-                                    <j-input-number
-                                        v-model:value="record.length"
-                                        :min="0"
-                                        :max="99999"
-                                        style="width: 100%"
-                                    />
-                                </j-form-item>
-                            </template>
-                            <template v-else-if="column.key === 'scale'">
-                                <j-form-item :name="['data', index, 'scale']">
-                                    <j-input-number
-                                        v-model:value="record.scale"
-                                        :min="0"
-                                        :max="99999"
-                                        style="width: 100%"
-                                    />
-                                </j-form-item>
-                            </template>
-                            <template v-else-if="column.key === 'notnull'">
-                                <j-form-item
-                                    :name="['data', index, 'notnull']"
-                                    :rules="[
-                                        {
-                                            required: true,
-                                            message: '请选择是否不能为空',
-                                        },
-                                    ]"
-                                >
-                                    <j-radio-group
-                                        v-model:value="record.notnull"
-                                        button-style="solid"
-                                    >
-                                        <j-radio-button :value="true"
-                                            >是</j-radio-button
-                                        >
-                                        <j-radio-button :value="false"
-                                            >否</j-radio-button
-                                        >
-                                    </j-radio-group>
-                                </j-form-item>
-                            </template>
-                            <template v-else-if="column.key === 'comment'">
-                                <j-form-item :name="['data', index, 'comment']">
-                                    <j-input
-                                        v-model:value="record.comment"
-                                        placeholder="请输入说明"
-                                    />
-                                </j-form-item>
-                            </template>
-                            <template v-else-if="column.key === 'action'">
-                                <PermissionButton
-                                    hasPermission="system/DataSource:delete"
-                                    type="link"
-                                    :tooltip="{ title: '删除' }"
-                                    :danger="true"
-                                    :popConfirm="{
-                                        title: `确认删除`,
-                                        onConfirm: () =>
-                                            clickDel(record, index),
-                                    }"
-                                    :disabled="record.status"
-                                >
-                                    <AIcon type="DeleteOutlined" />
-                                </PermissionButton>
-                            </template>
+                                </div>
+                                <span v-else>
+                                    {{ dataRef.title }}
+                                </span>
+                            </Ellipsis>
                         </template>
-                    </j-table>
-                </j-form>
+                    </j-tree>
+                </div>
+                <div class="right">
+                    <div class="btns">
+                        <j-button type="primary" @click="clickSave">保存</j-button>
+                    </div>
+                    <j-form ref="formRef" :model="table">
+                        <j-table
+                            :columns="columns"
+                            :dataSource="table.data"
+                            :pagination="false"
+                            :scroll="{ y: 500 }"
+                        >
+                            <template #bodyCell="{ column, record, index }">
+                                <template v-if="column.key === 'name'">
+                                    <j-form-item
+                                        :name="['data', index, 'name']"
+                                        :rules="[
+                                            {
+                                                max: 64,
+                                                message: '最多可输入64个字符',
+                                            },
+                                            {
+                                                required: true,
+                                                message: '请输入名称',
+                                            },
+                                        ]"
+                                    >
+                                        <j-input
+                                            :disabled="record.old_id"
+                                            v-model:value="record.name"
+                                            placeholder="请输入名称"
+                                        />
+                                    </j-form-item>
+                                </template>
+                                <template v-else-if="column.key === 'type'">
+                                    <j-form-item
+                                        :name="['data', index, 'type']"
+                                        :rules="[
+                                            {
+                                                max: 64,
+                                                message: '最多可输入64个字符',
+                                            },
+                                            {
+                                                required: true,
+                                                message: '请输入类型',
+                                            },
+                                        ]"
+                                    >
+                                        <j-input
+                                            v-model:value="record.type"
+                                            placeholder="请输入类型"
+                                        />
+                                    </j-form-item>
+                                </template>
+                                <template v-else-if="column.key === 'length'">
+                                    <j-form-item :name="['data', index, 'length']">
+                                        <j-input-number
+                                            v-model:value="record.length"
+                                            :min="0"
+                                            :max="99999"
+                                            style="width: 100%"
+                                        />
+                                    </j-form-item>
+                                </template>
+                                <template v-else-if="column.key === 'scale'">
+                                    <j-form-item :name="['data', index, 'scale']">
+                                        <j-input-number
+                                            v-model:value="record.scale"
+                                            :min="0"
+                                            :max="99999"
+                                            style="width: 100%"
+                                        />
+                                    </j-form-item>
+                                </template>
+                                <template v-else-if="column.key === 'notnull'">
+                                    <j-form-item
+                                        :name="['data', index, 'notnull']"
+                                        :rules="[
+                                            {
+                                                required: true,
+                                                message: '请选择是否不能为空',
+                                            },
+                                        ]"
+                                    >
+                                        <j-radio-group
+                                            v-model:value="record.notnull"
+                                            button-style="solid"
+                                        >
+                                            <j-radio-button :value="true"
+                                                >是</j-radio-button
+                                            >
+                                            <j-radio-button :value="false"
+                                                >否</j-radio-button
+                                            >
+                                        </j-radio-group>
+                                    </j-form-item>
+                                </template>
+                                <template v-else-if="column.key === 'comment'">
+                                    <j-form-item :name="['data', index, 'comment']">
+                                        <j-input
+                                            v-model:value="record.comment"
+                                            placeholder="请输入说明"
+                                        />
+                                    </j-form-item>
+                                </template>
+                                <template v-else-if="column.key === 'action'">
+                                    <PermissionButton
+                                        hasPermission="system/DataSource:delete"
+                                        type="link"
+                                        :tooltip="{ title: '删除' }"
+                                        :danger="true"
+                                        :popConfirm="{
+                                            title: `确认删除`,
+                                            onConfirm: () =>
+                                                clickDel(record, index),
+                                        }"
+                                        :disabled="record.status"
+                                    >
+                                        <AIcon type="DeleteOutlined" />
+                                    </PermissionButton>
+                                </template>
+                            </template>
+                        </j-table>
+                    </j-form>
 
-                <j-button class="add-row" @click="addRow">
-                    <AIcon type="PlusOutlined" /> 新增行
-                </j-button>
+                    <j-button class="add-row" @click="addRow">
+                        <AIcon type="PlusOutlined" /> 新增行
+                    </j-button>
+                </div>
             </div>
-        </div>
+        </FullPage>
         <j-modal
             :visible="true"
             v-if="dialog.visible"
@@ -495,12 +499,15 @@ const checkName = (_: any, value: any) =>
     padding: 24px;
     background-color: #fff;
     display: flex;
-    min-height: 500px;
+    height: 100%;
 
     .left {
         flex-basis: 280px;
         padding: 0 24px;
         box-sizing: border-box;
+        width:300px;
+        height:100%;
+        overflow-y: auto;
     }
     .right {
         width: calc(100% - 280px);
diff --git a/src/views/system/NoticeRule/components/Auth/index.vue b/src/views/system/NoticeRule/components/Auth/index.vue
index 5d61cae3..637910ac 100644
--- a/src/views/system/NoticeRule/components/Auth/index.vue
+++ b/src/views/system/NoticeRule/components/Auth/index.vue
@@ -8,7 +8,7 @@
     >
         <div class="alert">
             <AIcon type="InfoCircleOutlined" />
-            通过角色控制【{{ name }}】的所有的通知方式可被哪些用户订阅。
+            通过角色控制哪些用户可以订阅【{{ name }}】下所有的通知方式。
         </div>
         <Role v-model="_selectedRowKeys" :gridColumn="2" />
     </j-modal>
diff --git a/src/views/system/NoticeRule/components/Save/index.vue b/src/views/system/NoticeRule/components/Save/index.vue
index fca7e00c..4bd4bf86 100644
--- a/src/views/system/NoticeRule/components/Save/index.vue
+++ b/src/views/system/NoticeRule/components/Save/index.vue
@@ -63,7 +63,7 @@
             <template v-if="current === 4">
                 <div class="alert">
                     <AIcon type="InfoCircleOutlined" />
-                    已规定固定收信人的模板在当前页面将被过滤
+                    通过角色控制哪些用户可以订阅从【{{ name }}】接收到【{{ showName }}】通知
                 </div>
                 <Role type="add" v-model="formModel.grant.role.idList" />
             </template>
diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue
index 1b8ed397..528eeca0 100644
--- a/src/views/user/Login/index.vue
+++ b/src/views/user/Login/index.vue
@@ -109,7 +109,7 @@
                                         </j-button>
                                     </j-form-item>
                                 </j-form>
-                                <div class="other">
+                                <div class="other" v-if="bindings.length">
                                     <j-divider plain>
                                         <div class="other-text">
                                             其他登录方式
@@ -245,7 +245,7 @@ const codeUrl = ref('');
 const codeConfig = ref(false);
 
 const loading = ref(false);
-const bindings = ref<any[]>();
+const bindings = ref<any[]>([]);
 // const basis = ref<any>({});
 
 const defaultImg = getImage('/apply/internal-standalone.png');

From f1a40db0059c97ae017fd7e147c3ab0193235afa Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 8 Sep 2023 18:58:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E4=BD=8E=E7=A0=81?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/SinglePage.vue | 129 +++++++++++++++++++++++++++
 src/components/Layout/index.ts       |   3 +-
 src/utils/menu.ts                    |  15 +++-
 src/views/iframe/index.vue           |  12 ++-
 4 files changed, 151 insertions(+), 8 deletions(-)
 create mode 100644 src/components/Layout/SinglePage.vue

diff --git a/src/components/Layout/SinglePage.vue b/src/components/Layout/SinglePage.vue
new file mode 100644
index 00000000..cfdb6ac8
--- /dev/null
+++ b/src/components/Layout/SinglePage.vue
@@ -0,0 +1,129 @@
+<template>
+  <j-pro-layout
+      v-model:collapsed="basicLayout.collapsed"
+      v-model:openKeys="basicLayout.openKeys"
+      :breadcrumb="{ routes: breadcrumbs }"
+      :headerHeight='layout.headerHeight'
+      :pure="basicLayout.pure"
+      :selectedKeys="basicLayout.selectedKeys"
+      v-bind="layoutConf"
+      @backClick='routerBack'
+  >
+    <template #breadcrumbRender="slotProps">
+      <a
+          v-if="slotProps.route.index !== 0 && !slotProps.route.isLast"
+          @click='jump(slotProps.route)'
+      >
+        {{ slotProps.route.breadcrumbName }}
+      </a>
+      <span v-else style='cursor: default' >{{ slotProps.route.breadcrumbName }}</span>
+    </template>
+    <template #rightContentRender>
+      <div class="right-content">
+        <AIcon type="QuestionCircleOutlined" @click="toDoc" />
+        <Notice style="margin: 0 24px" />
+        <UserInfo />
+      </div>
+    </template>
+    <Iframe />
+  </j-pro-layout>
+</template>
+
+<script lang="ts" name="SinglePage" setup>
+import UserInfo from './components/UserInfo.vue';
+import Notice from './components/Notice.vue';
+import DefaultSetting from '../../../config/config';
+import { useMenuStore } from '@/store/menu';
+import { clearMenuItem } from 'jetlinks-ui-components/es/ProLayout/util';
+import { AccountMenu } from '@/router/menu'
+import { useSystem } from '@/store/system';
+import { storeToRefs } from 'pinia';
+import Iframe from '@/views/iframe/index.vue'
+
+type StateType = {
+  collapsed: boolean;
+  openKeys: string[];
+  selectedKeys: string[];
+  pure: boolean;
+};
+
+const router = useRouter();
+const route = useRoute();
+
+const menu = useMenuStore();
+
+const system = useSystem();
+const {configInfo,layout, basicLayout} = storeToRefs(system);
+
+const layoutConf = reactive({
+  theme: DefaultSetting.layout.theme,
+  siderWidth: layout.value.siderWidth,
+  logo: DefaultSetting.layout.logo,
+  title: DefaultSetting.layout.title,
+  menuData: menu.siderMenus,
+  // menuData: menu.siderMenus,
+  splitMenus: true,
+});
+
+watchEffect(() => {
+  layoutConf.theme = configInfo.value.front?.headerTheme || DefaultSetting.layout.theme;
+  layoutConf.title = configInfo.value.front?.title || DefaultSetting.layout.title;
+  layoutConf.logo = configInfo.value.front?.logo || DefaultSetting.layout.logo;
+})
+
+const components = computed(() => {
+  const componentName = route.matched[route.matched.length - 1]?.components?.default?.name
+  if (componentName !== 'BasicLayoutPage') {
+    return route.matched[route.matched.length - 1]?.components?.default
+  }
+  return undefined
+})
+
+/**
+ * 面包屑
+ */
+const breadcrumbs = computed(() =>
+    {
+      const paths = router.currentRoute.value.matched
+
+      return paths.map((item, index) => {
+        return {
+          index,
+          isLast: index === (paths.length -1),
+          path: item.path,
+          breadcrumbName: (item.meta as any).title || '',
+        }
+      })
+    }
+);
+
+const routerBack = () => {
+  router.go(-1)
+}
+
+
+const jump = (item: any) => {
+  router.push(item.path)
+}
+
+
+
+watchEffect(() => {
+  if (router.currentRoute) {
+    const paths = router.currentRoute.value.matched
+    basicLayout.value.selectedKeys = paths.map(item => item.path)
+    basicLayout.value.openKeys = paths.map(item => item.path)
+    console.log(paths) //
+  }
+})
+
+const toDoc = () => window.open('http://doc.v2.jetlinks.cn/');
+</script>
+
+<style scoped>
+.right-content {
+  margin-right: 24px;
+  display: flex;
+  align-items: center;
+}
+</style>
diff --git a/src/components/Layout/index.ts b/src/components/Layout/index.ts
index 9214b6a0..46483d31 100644
--- a/src/components/Layout/index.ts
+++ b/src/components/Layout/index.ts
@@ -1,3 +1,4 @@
 export { default as BasicLayoutPage } from './BasicLayoutPage.vue'
 export { default as BlankLayoutPage } from './BlankLayoutPage.vue'
-export { default as FullPage } from './FullPage.vue'
\ No newline at end of file
+export { default as FullPage } from './FullPage.vue'
+export { default as SinglePage } from './SinglePage.vue'
\ No newline at end of file
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 53e4ebe4..95619d93 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,6 +1,7 @@
-import { BlankLayoutPage, BasicLayoutPage } from 'components/Layout'
+import { BlankLayoutPage, BasicLayoutPage, SinglePage } from 'components/Layout'
 import { isNoCommunity } from '@/utils/utils'
 import Iframe from '../views/iframe/index.vue'
+import { h } from 'vue'
 
 const pagesComponent = import.meta.glob('../views/**/*.vue');
 
@@ -343,10 +344,12 @@ import { shallowRef } from 'vue'
 
 type Buttons = Array<{ id: string }>
 
-const hasAppID = (item: { appId?: string, url?: string }): { isApp: boolean, appUrl: string } => {
+const hasAppID = (item: any): { isApp: boolean, appUrl: string } => {
+  const isApp = !!item.appId
+  const isLowCode = !!item.options?.LowCode
   return {
-    isApp: !!item.appId,
-    appUrl: `/${item.appId}${item.url}`
+    isApp: isApp || isLowCode,
+    appUrl: isApp ? `/${item.appId}${item.url}` : item.url
   }
 }
 
@@ -453,6 +456,10 @@ export const handleMenus = (menuData: any[], components: any, level: number = 1)
         route.children = route.children ? [...route.children, ...extraRoute] : extraRoute
       }
 
+      if (item.options?.LowCode && level === 1) {
+        route.component = () => SinglePage
+      }
+
       if (detail_components.length) {
         route.children = route.children ? route.children.concat(detail_components) : detail_components
       }
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
index 2d9f9d92..4ab24f52 100644
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -10,7 +10,7 @@
 
 <script setup lang="ts">
 import { TOKEN_KEY } from '@/utils/variable';
-import { LocalStore } from '@/utils/comm';
+import { LocalStore, getToken } from '@/utils/comm';
 import { getAppInfo_api } from '@/api/system/apply';
 
 const iframeUrl = ref<string>('');
@@ -43,8 +43,14 @@ watchEffect(() => {
     const matchedItem: any = route.matched?.[0]
     if (matchedItem?.meta?.isApp) {
       const params = route.path.split('/')?.[1];
-      const url = route.path.split('/').slice(2).join('/');
-      handle(params, url);
+      console.log(route.path)
+      if (params === 'preview') {
+        console.log(route.path)
+        iframeUrl.value = 'http://192.168.33.46:9900' + '/#' + route.path + '?&token=' + getToken()
+      } else {
+        const url = route.path.split('/').slice(2).join('/');
+        handle(params, url);
+      }
     }
 });
 </script>

From 51794071a78700de283eee227b417ac34d5aa441 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 8 Sep 2023 19:16:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E4=BD=8E=E7=A0=81?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/comm.ts            |  4 +++-
 src/views/iframe/index.vue | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/api/comm.ts b/src/api/comm.ts
index 42384c5e..312d52ce 100644
--- a/src/api/comm.ts
+++ b/src/api/comm.ts
@@ -36,4 +36,6 @@ export const systemVersion = () => server.get<{edition?: string}>('/system/versi
  */
 export const queryDashboard = (data: Record<string, any>) => server.post(`/dashboard/_multi`, data)
 
-export const fileUpload = (data: any) => server.post('/file/static', data)
\ No newline at end of file
+export const fileUpload = (data: any) => server.post('/file/static', data)
+
+export const lowCodeUrl = () => server.get('/system/config/low-code')
\ No newline at end of file
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
index 4ab24f52..ecead7ec 100644
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@@ -1,6 +1,7 @@
 <template>
     <page-container>
         <iframe
+            v-if="loading"
             :src="iframeUrl"
             frameBorder="0"
             style="width: 100%; height: calc(100vh - 140px)"
@@ -12,10 +13,11 @@
 import { TOKEN_KEY } from '@/utils/variable';
 import { LocalStore, getToken } from '@/utils/comm';
 import { getAppInfo_api } from '@/api/system/apply';
+import { lowCodeUrl } from '@/api/comm'
 
 const iframeUrl = ref<string>('');
 const route = useRoute()
-
+const loading = ref(false)
 const handle = async (appId: string, url: string) => {
     const res = await getAppInfo_api(appId);
     let menuUrl: any = url;
@@ -38,16 +40,23 @@ const handle = async (appId: string, url: string) => {
     }
 };
 
+const lowCode = () => {
+  lowCodeUrl().then(res => {
+    if (res.success && res.result) {
+      const url = res.result['ui-addr']
+      iframeUrl.value = url + '/#' + route.path + '?&token=' + getToken()
+    }
+  })
+}
 
 watchEffect(() => {
     const matchedItem: any = route.matched?.[0]
     if (matchedItem?.meta?.isApp) {
       const params = route.path.split('/')?.[1];
-      console.log(route.path)
       if (params === 'preview') {
-        console.log(route.path)
-        iframeUrl.value = 'http://192.168.33.46:9900' + '/#' + route.path + '?&token=' + getToken()
+        lowCode()
       } else {
+        loading.value = true
         const url = route.path.split('/').slice(2).join('/');
         handle(params, url);
       }