Merge branch 'ft-dev' into 'main'

fix:修复租户角色回显问题，修复场景联动中新增时应该清处请选择设备问题

See merge request huang/yun-teng-iot-front!82

 import type { AppRouteRecordRaw, AppRouteModule } from '/@/router/types';
 import type { AppRouteRecordRaw, AppRouteModule } from '/@/router/types';
-
 import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE } from '/@/router/routes/basic';
 import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE } from '/@/router/routes/basic';
-
 import { mainOutRoutes } from './mainOut';
 import { mainOutRoutes } from './mainOut';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { t } from '/@/hooks/web/useI18n';
 import { t } from '/@/hooks/web/useI18n';
 
 
 const modules = import.meta.globEager('./modules/**/*.ts');
 const modules = import.meta.globEager('./modules/**/*.ts');
-
 const routeModuleList: AppRouteModule[] = [];
 const routeModuleList: AppRouteModule[] = [];
-
 Object.keys(modules).forEach((key) => {
 Object.keys(modules).forEach((key) => {
   const mod = modules[key].default || {};
   const mod = modules[key].default || {};
   const modList = Array.isArray(mod) ? [...mod] : [mod];
   const modList = Array.isArray(mod) ? [...mod] : [mod];
   routeModuleList.push(...modList);
   routeModuleList.push(...modList);
 });
 });
-
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList];
 export const asyncRoutes = [PAGE_NOT_FOUND_ROUTE, ...routeModuleList];
-
 export const RootRoute: AppRouteRecordRaw = {
 export const RootRoute: AppRouteRecordRaw = {
   path: '/',
   path: '/',
   name: 'Root',
   name: 'Root',
-  // redirect: '/',
   redirect: PageEnum.BASE_HOME,
   redirect: PageEnum.BASE_HOME,
-  // redirect: !PageEnum.BASE_HOME ? '/dashboard' : PageEnum.BASE_HOME,
-  // redirect: '/dashboard',
   meta: {
   meta: {
     title: 'Root',
     title: 'Root',
   },
   },

@@ -43,7 +43,6 @@ export const formSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       maxLength: 255,
       maxLength: 255,
       placeholder: '请输入设备名称',
       placeholder: '请输入设备名称',
-      maxLength: 255,
     },
     },
   },
   },
   {
   {

@@ -58,7 +58,6 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
     componentProps: {
       maxLength: 36,
       maxLength: 36,
       placeholder: '请输入联系人姓名',
       placeholder: '请输入联系人姓名',
-      maxLength: 36,
     },
     },
   },
   },
 ];
 ];

@@ -99,6 +99,23 @@
       function funcResetFields() {
       function funcResetFields() {
         resetFields();
         resetFields();
       }
       }
+      //新增清空设备选择
+      const clearSelectDevice = () => {
+        updateSchema({
+          field: 'deviceId',
+          componentProps: {
+            options: [],
+          },
+        });
+      };
+      const editSelectDevice = (v) => {
+        updateSchema({
+          field: 'deviceId',
+          componentProps: {
+            options: v,
+          },
+        });
+      };
 
 
       const n = ref(1);
       const n = ref(1);
       function add() {
       function add() {
@@ -311,7 +328,16 @@
         ]);
         ]);
         n.value--;
         n.value--;
       }
       }
-      return { setFieldsFormValue, registerCondition, add, del, getAllFields, funcResetFields };
+      return {
+        editSelectDevice,
+        clearSelectDevice,
+        setFieldsFormValue,
+        registerCondition,
+        add,
+        del,
+        getAllFields,
+        funcResetFields,
+      };
     },
     },
   });
   });
 </script>
 </script>

@@ -93,6 +93,23 @@
       function funcResetFields() {
       function funcResetFields() {
         resetFields();
         resetFields();
       }
       }
+      //新增清空设备选择
+      const clearSelectDevice = () => {
+        updateSchema({
+          field: 'deviceId',
+          componentProps: {
+            options: [],
+          },
+        });
+      };
+      const editSelectDevice = (v) => {
+        updateSchema({
+          field: 'deviceId',
+          componentProps: {
+            options: v,
+          },
+        });
+      };
       const n = ref(1);
       const n = ref(1);
       function add() {
       function add() {
         appendSchemaByField(
         appendSchemaByField(
@@ -236,7 +253,16 @@
         n.value--;
         n.value--;
       }
       }
 
 
-      return { setFieldsFormValue, registerAction, add, del, getAllFields, funcResetFields };
+      return {
+        editSelectDevice,
+        clearSelectDevice,
+        setFieldsFormValue,
+        registerAction,
+        add,
+        del,
+        getAllFields,
+        funcResetFields,
+      };
     },
     },
   });
   });
 </script>
 </script>

@@ -101,6 +101,23 @@
       const setFieldsFormValue = (v) => {
       const setFieldsFormValue = (v) => {
         setFieldsValue(v);
         setFieldsValue(v);
       };
       };
+      //新增清空设备选择
+      const clearSelectDevice = () => {
+        updateSchema({
+          field: 'deviceId',
+          componentProps: {
+            options: [],
+          },
+        });
+      };
+      const editSelectDevice = (v) => {
+        updateSchema({
+          field: 'deviceId',
+          componentProps: {
+            options: v,
+          },
+        });
+      };
       // //去除字符串的数字
       // //去除字符串的数字
       // function trimNumber(str) {
       // function trimNumber(str) {
       //   return str.replace(/\d+/g, '');
       //   return str.replace(/\d+/g, '');
@@ -119,16 +136,15 @@
         console.log(getPushValueData.value);
         console.log(getPushValueData.value);
         return getV;
         return getV;
       }
       }
-      function funcResetFields() {
-        resetFields();
+      async function funcResetFields() {
+        await resetFields();
       }
       }
       const addString: any = ref('tiggerEvent1') || ref('tiggerEvent2') || ref('tiggerEvent3');
       const addString: any = ref('tiggerEvent1') || ref('tiggerEvent2') || ref('tiggerEvent3');
 
 
       const n = ref(1);
       const n = ref(1);
       function add() {
       function add() {
-        const values = getFieldsValue();
-        getPushValueData.value.push(values);
-        console.log(getPushValueData.value);
+        // const values = getFieldsValue();
+        // getPushValueData.value.push(values);
         // newMapGetPushValueData.value = getPushValueData.value.map((m) => {
         // newMapGetPushValueData.value = getPushValueData.value.map((m) => {
         //   const getKeys = Object.keys(m);
         //   const getKeys = Object.keys(m);
         //   getKeys.map((f) => {
         //   getKeys.map((f) => {
@@ -372,6 +388,8 @@
         n.value--;
         n.value--;
       }
       }
       return {
       return {
+        editSelectDevice,
+        clearSelectDevice,
         clearGetPushValueDataEmpty,
         clearGetPushValueDataEmpty,
         setFieldsFormValue,
         setFieldsFormValue,
         registerTrigger,
         registerTrigger,

@@ -292,10 +292,8 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     field: 'deviceId',
     field: 'deviceId',
     label: '',
     label: '',
     component: 'Select',
     component: 'Select',
-    componentProps() {
-      return {
-        placeholder: '请选择设备',
-      };
+    componentProps: {
+      placeholder: '请选择设备',
     },
     },
     // componentProps: {
     // componentProps: {
     //   placeholder: '请选择设备',
     //   placeholder: '请选择设备',

@@ -18,7 +18,11 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema, getData } from './config.d';
   import { formSchema, getData } from './config.d';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { screenLinkPageAddApi, screenLinkPageUpdateApi } from '/@/api/ruleengine/ruleengineApi';
+  import {
+    screenLinkPageAddApi,
+    screenLinkPageUpdateApi,
+    screenLinkPageByDeptIdGetDevice,
+  } from '/@/api/ruleengine/ruleengineApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import AddTriggerForm from './addForm/trigger.vue';
   import AddTriggerForm from './addForm/trigger.vue';
   import AddActionForm from './addForm/doaction.vue';
   import AddActionForm from './addForm/doaction.vue';
@@ -45,12 +49,14 @@
       let getDeviceInfo1 = ref(null);
       let getDeviceInfo1 = ref(null);
       let getDeviceInfo2 = ref(null);
       let getDeviceInfo2 = ref(null);
 
 
-      const [registerForm, { resetFields, setFieldsValue, validateFields, getFieldsValue }] =
-        useForm({
-          labelWidth: 120,
-          schemas: formSchema,
-          showActionButtonGroup: false,
-        });
+      const [
+        registerForm,
+        { resetFields, setFieldsValue, validateFields, getFieldsValue, updateSchema },
+      ] = useForm({
+        labelWidth: 120,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
 
 
       watch(getData, (newV) => {
       watch(getData, (newV) => {
         getDeviceInfo.value = newV;
         getDeviceInfo.value = newV;
@@ -59,18 +65,55 @@
       });
       });
 
 
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-        proxy.$refs.getChildData.funcResetFields();
-        proxy.$refs.getTriggerChildData.funcResetFields();
-        proxy.$refs.getConditionChildData.funcResetFields();
+        console.log(data);
         await resetFields();
         await resetFields();
         setDrawerProps({ confirmLoading: false });
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
         isUpdate.value = !!data?.isUpdate;
+
+        if (!unref(isUpdate)) {
+          proxy.$refs.getTriggerChildData.clearSelectDevice();
+          proxy.$refs.getChildData.clearSelectDevice();
+          proxy.$refs.getConditionChildData.clearSelectDevice();
+          proxy.$refs.getChildData.funcResetFields();
+          proxy.$refs.getTriggerChildData.funcResetFields();
+          proxy.$refs.getConditionChildData.funcResetFields();
+        }
         //编辑
         //编辑
         if (unref(isUpdate)) {
         if (unref(isUpdate)) {
           getId.value = data.record.id;
           getId.value = data.record.id;
           await setFieldsValue({
           await setFieldsValue({
             ...data.record,
             ...data.record,
           });
           });
+          let newMap = null;
+          let newFilterMap = null;
+          let newTwoFilterMap = null;
+          let newFilterTwoFilterMap = null;
+          const options = await screenLinkPageByDeptIdGetDevice({
+            organizationId: data.record.organizationId,
+          });
+          newMap = options.items.map((m) => {
+            newTwoFilterMap = data.record?.triggers.map((m1) => {
+              if (m.id == m1.deviceId) {
+                return {
+                  value: m.id,
+                  label: m.name,
+                };
+              }
+            });
+
+            if (m.id == data.record?.triggers[0].deviceId) {
+              return {
+                value: m.id,
+                label: m.name,
+              };
+            }
+          });
+          newFilterMap = newMap.filter((f) => f !== undefined);
+          newFilterTwoFilterMap = newTwoFilterMap.filter((f) => f !== undefined);
+          proxy.$refs.getTriggerChildData.editSelectDevice(newFilterMap);
+          proxy.$refs.getChildData.editSelectDevice(newFilterMap);
+          proxy.$refs.getConditionChildData.editSelectDevice(newFilterMap);
+
           try {
           try {
             proxy.$refs.getTriggerChildData.setFieldsFormValue({
             proxy.$refs.getTriggerChildData.setFieldsFormValue({
               triggerEvent: data.record.triggers[0].triggerEvent,
               triggerEvent: data.record.triggers[0].triggerEvent,

@@ -70,10 +70,10 @@
                         if (value == findUserName?.username) {
                         if (value == findUserName?.username) {
                           reject('账号已存在');
                           reject('账号已存在');
                         } else {
                         } else {
-                          return reject('');
+                          reject('请输入');
                         }
                         }
                       } catch (e) {
                       } catch (e) {
-                        return e;
+                        return reject(e);
                       }
                       }
                       resolve();
                       resolve();
                     }
                     }

@@ -105,7 +105,7 @@
             roleMenus.value = await getMenusIdsByRoleId(data.record.id);
             roleMenus.value = await getMenusIdsByRoleId(data.record.id);
             treeData.value.map((m) => {
             treeData.value.map((m) => {
               roleMenus.value.map((m1) => {
               roleMenus.value.map((m1) => {
-                if (m.key === m1) {
+                if (m.key === m1 && m.children.length !== 0) {
                   proxy.useChildrenIdsRemoveParentId(m1, roleMenus.value);
                   proxy.useChildrenIdsRemoveParentId(m1, roleMenus.value);
                 }
                 }
               });
               });
@@ -117,17 +117,6 @@
             ...data.record,
             ...data.record,
           });
           });
         }
         }
-
-        // if (data.record) {
-        //   roleMenus.value = await getMenusIdsByRoleId(data.record.id);
-        //   roleId.value = data.record.id;
-        // }
-        // isUpdate.value = !!data?.isUpdate;
-        // if (unref(isUpdate)) {
-        //   setFieldsValue({
-        //     ...data.record,
-        //   });
-        // }
       });
       });
 
 
       // Tree check事件
       // Tree check事件

@@ -81,7 +81,6 @@
           record,
           record,
           isUpdate: true,
           isUpdate: true,
         });
         });
-        console.log(record);
       }
       }
 
 
       async function handleDelete(record: Recordable) {
       async function handleDelete(record: Recordable) {