Merge branch 'f-dev' into 'main'

fix：修改teambition上的问题

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

 node_modules
+.history
 .DS_Store
 dist
 .npmrc

@@ -17,7 +17,7 @@ enum ScreenManagerApi {
   SCREEN_UPDATE_URL = '/sceneLinkage/update',
   SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_CHANGE_STATUS = '/convert/update/scene',
-  SCREEN_GET_BY_DEPTID = '/sceneLinkage/device',
+  SCREEN_GET_BY_DEPTID = '/sceneLinkage/device/',
   GET_ATTRBUTELIST = '/device/keys',
   ALARM_PROFILE = '/alarm/profile/',
   MASTER_GET_DEVICE = '/device/list/master',

 import { FormSchema } from '/@/components/Table';
-import { phoneRule, emailRule } from '/@/utils/rules';
+import { phoneRule, emailRule, chineseAndEnlishRule } from '/@/utils/rules';
 
 export const formSchema: FormSchema[] = [
   {
@@ -12,6 +12,7 @@ export const formSchema: FormSchema[] = [
       maxLength: 10,
       placeholder: '请输入用户昵称',
     },
+    rules: chineseAndEnlishRule,
   },
   {
     field: 'phoneNumber',

@@ -20,6 +20,23 @@ export const numberRule: Rule[] = [
 ];
 export const phoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
 
+//中英文正则
+export const chineseAndEnlishRule: Rule[] = [
+  {
+    required: true,
+    validator: (_, value: string) => {
+      const reg = /^[a-zA-Z\u4e00-\u9fa5]+$/;
+      if (value === '') {
+        return Promise.reject('请输入');
+      } else if (!reg.test(value)) {
+        return Promise.reject('格式不正确');
+      }
+      return Promise.resolve();
+    },
+    validateTrigger: 'blur',
+  },
+];
+
 // 手机号验证
 export const phoneRule: Rule[] = [
   {
@@ -41,7 +58,7 @@ export const phoneRule: Rule[] = [
 export const emailRule: Rule[] = [
   {
     validator: (_, value: string) => {
-      const reg = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
+      const reg = /^[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/;
       if (!value) {
         return Promise.resolve();
       } else if (!reg.test(value)) {

@@ -165,6 +165,7 @@
         if (record.status === 1) {
           return { disabled: true };
         } else {
+          singleStopDeleteStatus.value = false;
           return { disabled: false };
         }
       };

@@ -96,7 +96,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import {
     screenLinkPageAddApi,
-    // screenLinkPageByDeptIdGetDevice,
+    screenLinkPageByDeptIdGetDevice,
     getOrganizationAlarmConfig,
     byOganizationIdGetMasterDevice,
     getAttribute,
@@ -125,6 +125,7 @@
   let getConditionFormValue = ref([]);
   let getActionFormValue = ref([]);
   const editEntryIdData = ref([]);
+  const editEntryIdExcludeDoActionData = ref([]);
   let editAttrIdData = [];
   const editAlarmConfigData = ref([]);
   const isUpdate = ref(false);
@@ -160,6 +161,7 @@
       provideOrgid.value = organizationId;
       // 获取当前组织下的设备列表
       const options = await byOganizationIdGetMasterDevice(organizationId);
+      const optionsExcludeDoAction = await screenLinkPageByDeptIdGetDevice({ organizationId });
       // 获取当前组织下的告警配置
       const alarmConfig = await getOrganizationAlarmConfig({ organizationId });
       // 获取当前组织下的属性列表
@@ -179,6 +181,12 @@
           label: item.name,
         };
       });
+      editEntryIdExcludeDoActionData.value = optionsExcludeDoAction.items.map((item) => {
+        return {
+          value: item.tbDeviceId,
+          label: item.name,
+        };
+      });
       editAlarmConfigData.value = alarmConfig.map((item) => {
         return {
           value: item.id,
@@ -189,8 +197,8 @@
       //回显属性列表
       editAttrIdData = attrList;
       nextTick(() => {
-        setEditFields(skipUnwrap.triggerItemRefs, editEntryIdData);
-        setEditFields(skipUnwrap.conditionItemRefs, editEntryIdData);
+        setEditFields(skipUnwrap.triggerItemRefs, editEntryIdExcludeDoActionData);
+        setEditFields(skipUnwrap.conditionItemRefs, editEntryIdExcludeDoActionData);
         setEditFields(skipUnwrap.actionItemRefs, editEntryIdData);
         setEditAlarmConfig(skipUnwrap.actionItemRefs, editAlarmConfigData);
         setEditAttr(skipUnwrap.triggerItemRefs, editAttrIdData);
@@ -482,7 +490,11 @@
   // 设置设备的options
   const setEditFields = (linkAge, deviceList) => {
     unref(linkAge).map((item) => {
-      item.updateFieldDeviceId(deviceList);
+      if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
+        item.updateExcludeActionFieldDeviceId(deviceList);
+      } else {
+        item.updateFieldDeviceId(deviceList);
+      }
     });
   };
   // 设置告警配置options
@@ -502,10 +514,16 @@
   const deviceList = ref([]);
   const alarmConfigList = ref([]);
   let watchAttrList = [];
+  const deviceExcludeDoAction = ref([]);
   watch(organizationId, async (newValue: string) => {
     if (!newValue) return;
     provideOrgid.value = newValue;
     const items = await byOganizationIdGetMasterDevice(newValue);
+    const itemExcludeDoAction = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
+    deviceExcludeDoAction.value = itemExcludeDoAction.items.map((item) => ({
+      label: item.name,
+      value: item.tbDeviceId,
+    }));
     deviceList.value = items.map((item) => ({ label: item.name, value: item.id }));
     watchAttrList = await getAttribute(newValue, null);
     setFields(skipUnwrap.triggerItemRefs, true);
@@ -520,7 +538,12 @@
   function setFields(linkAge, isOrganizationChange = false) {
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
-      item.updateFieldDeviceId(deviceList);
+      console.log(item);
+      if (item.isTriggerAndConditionFlag == 'isTriggerAndConditionFlag') {
+        item.updateExcludeActionFieldDeviceId(deviceExcludeDoAction);
+      } else {
+        item.updateFieldDeviceId(deviceList);
+      }
       // item.updateFieldAttr(watchAttrList);
     });
   }

@@ -98,7 +98,7 @@
     );
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
-  const updateFieldDeviceId = (deviceList: any[]) => {
+  const updateExcludeActionFieldDeviceId = (deviceList: any[]) => {
     updateSchema({
       field: 'entityId',
       componentProps: {
@@ -195,9 +195,11 @@
     currentIndex.value = index;
   };
   const scheduleData = ref(null);
+  const isTriggerAndConditionFlag = 'isTriggerAndConditionFlag';
   defineExpose({
+    isTriggerAndConditionFlag,
     getFieldsValueFunc,
-    updateFieldDeviceId,
+    updateExcludeActionFieldDeviceId,
     updateFieldAttr,
     resetFieldsValueFunc,
     setFieldsFormValueFun,

@@ -45,7 +45,7 @@
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
-          fieldMapToTime: [['queryTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+          fieldMapToTime: [['queryTime', ['startTime', 'endTime'], 'x']],
         },
         useSearchForm: true,
         showTableSetting: true,

@@ -45,7 +45,7 @@
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
-          fieldMapToTime: [['queryTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+          fieldMapToTime: [['queryTime', ['startTime', 'endTime'], 'x']],
         },
         useSearchForm: true,
         showTableSetting: true,

@@ -45,7 +45,7 @@
         formConfig: {
           labelWidth: 120,
           schemas: searchFormSchema,
-          fieldMapToTime: [['queryTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+          fieldMapToTime: [['queryTime', ['startTime', 'endTime'], 'x']],
         },
         useSearchForm: true,
         showTableSetting: true,

@@ -13,7 +13,7 @@
           v-if="treeData.length"
           checkable
           toolbar
-          autoExpandParent
+          :expandedKeys="treeExpandData"
           ref="treeRef"
           :treeData="treeData"
           :replaceFields="{ title: 'menuName' }"
@@ -43,6 +43,7 @@
     components: { BasicDrawer, BasicForm, BasicTree },
     emits: ['success', 'register'],
     setup(_, { emit }) {
+      const treeExpandData = ref([]);
       const isUpdate = ref<boolean>(true);
       const treeData = ref<TreeItem[]>([]);
       const roleMenus = ref<string[]>([]);
@@ -69,13 +70,12 @@
           }
         });
       }
-      // function lookForAllId(data = [], arr = []) {
-      //   for (const item of data) {
-      //     arr.push(item.parentId);
-      //     if (item.children && item.children.length > 0) lookForAllId(item.children, arr);
-      //   }
-      //   return arr;
-      // }
+      function lookForAllId(data = [], arr = []) {
+        for (const item of data) {
+          arr.push(item.id);
+        }
+        return arr;
+      }
       const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         allCheckedKeys.value = [];
@@ -98,6 +98,9 @@
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           originMenus.value = [...roleMenus.value];
+
+          const getAllIds = lookForAllId(treeData.value, []);
+          treeExpandData.value = getAllIds;
           for (let item of treeData.value) {
             if (item?.children != 0) {
               pidArr.value.push(item.key);
@@ -138,7 +141,6 @@
             status: values.status,
             menu: allCheckedKeys.value.length ? allCheckedKeys.value : originMenus.value,
           };
-          console.log(allCheckedKeys.value);
           if (allCheckedKeys.value.length == 0) return createMessage.error('请勾选权限菜单');
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {
@@ -165,6 +167,7 @@
         treeRef,
         handleCheckClick,
         allCheckedKeys,
+        treeExpandData,
       };
     },
   });

@@ -18,6 +18,7 @@
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
   // import { isAccountExist } from '/@/api/system/system';
+  import { chineseAndEnlishRule } from '/@/utils/rules';
 
   export default defineComponent({
     name: 'TenantAdminFormDrawer',
@@ -88,6 +89,7 @@
           componentProps: {
             maxLength: 255,
           },
+          rules: chineseAndEnlishRule,
         },
         {
           field: 'phoneNumber',

@@ -12,6 +12,7 @@
         <BasicTree
           v-if="treeData.length > 0"
           :treeData="treeData"
+          :expandedKeys="treeExpandData"
           autoExpandParent
           :replaceFields="{ title: 'menuName' }"
           :checkedKeys="roleMenus"
@@ -46,6 +47,8 @@
     components: { BasicDrawer, BasicForm, BasicTree },
     emits: ['success', 'register'],
     setup(_, { emit }) {
+      const treeExpandData = ref([]);
+
       const isUpdate = ref(true);
       const treeData = ref<TreeItem[]>([]);
       const roleMenus = ref<string[]>([]);
@@ -71,6 +74,12 @@
           }
         });
       }
+      function lookForAllId(data = [], arr = []) {
+        for (const item of data) {
+          arr.push(item.id);
+        }
+        return arr;
+      }
 
       const originMenus = ref();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
@@ -95,6 +104,8 @@
           //通过角色id去获取角色对应的菜单的ids
           roleMenus.value = await getMenusIdsByRoleId(data.record.id);
           originMenus.value = [...roleMenus.value];
+          const getAllIds = lookForAllId(treeData.value, []);
+          treeExpandData.value = getAllIds;
           for (let item of treeData.value) {
             if (item?.children != 0) {
               pidArr.value.push(item.key);
@@ -160,6 +171,7 @@
         roleMenus,
         treeRef,
         handleCheckClick,
+        treeExpandData,
       };
     },
   });