Merge branch 'sqy_dev' into 'main'

fix:修改租户管理bug，修改站内通知的问题，修改设备更改

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

@@ -4,7 +4,7 @@ import { Rule } from 'ant-design-vue/lib/form/interface';
  *
  */
 
-// 手机号验证
+// 数字验证
 export const numberRule: Rule[] = [
   {
     required: true,
@@ -51,3 +51,12 @@ export const emailRule: Rule[] = [
     validateTrigger: 'blur',
   },
 ];
+
+// 中文正则
+export const ChineseRegexp = /[\u4E00-\u9FA5]/g;
+
+// 电子邮箱正则
+export const EmailRegexp = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
+
+// 手机号正则
+export const PhoneRegexp = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;

@@ -73,7 +73,7 @@ export const step1Schemas: FormSchema[] = [
     slot: 'deviceAddress',
   },
   {
-    field: 'remark',
+    field: 'description',
     label: '备注',
     component: 'InputTextArea',
   },

 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
+import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+
 export const columns: BasicColumn[] = [
   {
     title: '设备名称',
@@ -24,12 +26,19 @@ export const columns: BasicColumn[] = [
     title: '设备类型',
     dataIndex: 'deviceType',
     key: 'deviceType',
+    customRender({ text }) {
+      return text === DeviceTypeEnum.GATEWAY
+        ? '网关设备'
+        : text == DeviceTypeEnum.DIRECT_CONNECTION
+        ? '直连设备'
+        : '网关子设备';
+    },
   },
   {
     title: '描述',
-    dataIndex: 'label',
+    dataIndex: 'description',
     width: 180,
-    key: 'label',
+    key: 'description',
   },
 ];
 

@@ -15,7 +15,7 @@
         ><RealTimeData
       /></TabPane>
       <TabPane key="3" tab="告警"><Alarm :id="deviceId" /></TabPane>
-      <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'SENSOR'"
+      <TabPane key="4" tab="子设备" v-if="deviceDetail?.deviceType === 'GATEWAY'"
         ><ChildDevice
       /></TabPane>
     </Tabs>

@@ -57,7 +57,7 @@
       const DeviceStep2Ref = ref<InstanceType<typeof DeviceStep2>>();
       const { createMessage } = useMessage();
       const current = ref(0);
-      const isUpdate = ref(true);
+      const isUpdate = ref<Boolean>();
       const deviceInfo = ref({});
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备' : '编辑设备'));
       // 所有参数
@@ -68,17 +68,15 @@
           DeviceStep1Ref?.value?.parentSetFieldsValue(data.record);
           DeviceStep1Ref?.value?.parentSetFieldsValue({
             profile: data.record.deviceProfile.name,
-            remark: data.record.deviceInfo.description,
             profileId: data.record.profileId,
             deviceType: data.record.deviceType,
           });
           deviceInfo.value = data.record.deviceInfo;
         } else {
-          DeviceStep1Ref?.value?.parentResetDevicePic();
           DeviceStep1Ref?.value?.parentResetPositionState();
           deviceInfo.value = {};
         }
-        isUpdate.value = !!data?.isUpdate;
+        isUpdate.value = data?.isUpdate;
       });
 
       // 上一步
@@ -95,9 +93,11 @@
         stepState.value = { ...stepState, ...step2Values };
       }
       function handleCancel() {
+        if (unref(isUpdate)) {
+          DeviceStep1Ref?.value?.parentResetDevicePic(deviceInfo.value);
+        }
         current.value = 0;
         DeviceStep1Ref?.value?.resetFields();
-        DeviceStep1Ref.value?.parentResetDevicePic();
         DeviceStep2Ref?.value?.resetFields();
       }
       // 提交

@@ -230,8 +230,8 @@
       }
 
       // 父组件重置图片
-      function parentResetDevicePic() {
-        devicePic.value = '';
+      function parentResetDevicePic(deviceInfo) {
+        devicePic.value = deviceInfo.avatar;
       }
       // 父组件重置位置
       function parentResetPositionState() {

@@ -228,7 +228,7 @@ export const formSchema: FormSchema[] = [
     component: 'InputTextArea',
   },
   {
-    label: '租户id',
+    label: '租户ID',
     field: 'tenantId',
     component: 'Input',
     show: false,

@@ -134,6 +134,7 @@ export const formSchema: FormSchema[] = [
     component: 'ApiTreeSelect',
     required: true,
     componentProps: {
+      multiple: true,
       api: async () => {
         const data = await getOrganizationList();
         copyTransFun(data as any as any[]);

@@ -37,126 +37,6 @@
     components: { BasicDrawer, BasicForm, Button },
     emits: ['success', 'register'],
     setup(_, { emit }) {
-      // const isUpdate = ref(true);
-      // // const pointArray = ref([] as any);
-      // // const isJudgeWherePoint = ref();
-      // // const newArray = ref([]);
-      // let getId = ref('');
-      // // let getOranAndDeptId = ref(null);
-      // // let getAllData: any = reactive({});
-      // // let getAllEditData: any = reactive({});
-      // // let postAllEditData: any = reactive({});
-      // const [registerForm, { setFieldsValue, resetFields, validate, getFieldsValue }] = useForm({
-      //   labelWidth: 120,
-      //   schemas: formSchema,
-      //   showActionButtonGroup: false,
-      // });
-      // const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-      //   await resetFields();
-      //   setDrawerProps({ confirmLoading: false });
-      //   isUpdate.value = !!data?.isUpdate;
-      //   //编辑
-      //   if (unref(isUpdate)) {
-      //     getId.value = data.record.id;
-      //     await setFieldsValue({
-      //       ...data.record,
-      //       receiverType: data.record.receiverType === '全部' ? '0' : '1',
-      //       organizationId: isDeptId.value,
-      //     });
-      //   }
-      // });
-      // const getTitle = computed(() => (!unref(isUpdate) ? '新增通知' : '编辑通知'));
-
-      // watch(selectWhere, (nV) => {
-      //   isJudgeWherePoint.value = nV;
-      // });
-      // watch(isDeptId, (nV) => {
-      //   getOranAndDeptId.value = nV;
-      // });
-      // // 发布
-      // async function handleSend() {
-      //   // 直接新增通知
-      //   if (!unref(isUpdate)) {
-      //     const values = await validate();
-      //     Object.assign(getAllData, values);
-      //     switch (unref(isJudgeWherePoint)) {
-      //       case '0':
-      //         pointArray.value = [];
-      //         break;
-      //       case '1':
-      //         if (pointArray.value.length === 0) {
-      //           pointArray.value.push(getOranAndDeptId.value);
-      //         }
-      //         break;
-      //     }
-      //     getAllData.pointId = pointArray.value;
-      //     await notifyAddLeaseApi(getAllData);
-
-      //     resetFields();
-      //   } else {
-      //     const values = await validate();
-      //     getAllEditData = values;
-      //     getAllEditData.id = unref(getId);
-      //     switch (unref(isJudgeWherePoint)) {
-      //       case '0':
-      //         pointArray.value = [];
-      //         break;
-      //       case '1':
-      //         if (pointArray.value.length === 0) {
-      //           pointArray.value.push(getOranAndDeptId.value);
-      //         }
-      //         break;
-      //     }
-      //     getAllEditData.pointId = pointArray.value;
-      //     Object.assign(postAllEditData, getAllEditData);
-      //     await notifyAddLeaseApi(postAllEditData);
-      //   }
-      //   closeDrawer();
-      //   createMessage.success('发布成功');
-      //   emit('success');
-      // }
-      // // 保存草稿
-      // async function handleSaveDraft() {
-      //   if (!unref(isUpdate)) {
-      //     const values = await validate();
-      //     Object.assign(getAllData, values);
-      //     switch (isJudgeWherePoint.value) {
-      //       case '0':
-      //         pointArray.value = [];
-      //         break;
-      //       case '1':
-      //         if (pointArray.value.length === 0) {
-      //           pointArray.value.push(getOranAndDeptId.value);
-      //         }
-      //         break;
-      //     }
-      //     getAllData.pointId = pointArray.value;
-      //     await notifyAddDraftApi(getAllData);
-
-      //     resetFields();
-      //   } else {
-      //     const values = await validate();
-      //     getAllEditData = values;
-      //     getAllEditData.id = getId.value;
-      //     switch (isJudgeWherePoint.value) {
-      //       case '0':
-      //         pointArray.value = [];
-      //         break;
-      //       case '1':
-      //         if (pointArray.value.length === 0) {
-      //           pointArray.value.push(getOranAndDeptId.value);
-      //         }
-      //         break;
-      //     }
-      //     getAllEditData.pointId = pointArray.value;
-      //     Object.assign(postAllEditData, getAllEditData);
-      //     await notifyAddDraftApi(postAllEditData);
-      //   }
-      //   createMessage.success('保存草稿成功');
-      //   closeDrawer();
-      //   emit('success');
-      // }
-      // 取消
       const { createMessage } = useMessage();
       const isUpdate = ref<Boolean>();
       const getTitle = computed(() => (!unref(isUpdate) ? '新增通知' : '编辑通知'));
@@ -167,22 +47,24 @@
         showActionButtonGroup: false,
       });
       const [registerDrawer, { closeDrawer }] = useDrawerInner(async (data) => {
+        await resetFields();
         isUpdate.value = data.isUpdate;
         //编辑
-        if (unref(isUpdate)) {
+        if (data.isUpdate) {
           noticeId.value = data.record.id;
-          console.log(data.record);
-          await setFieldsValue({
-            ...data.record,
-            receiverType: data.record.receiverType === '全部' ? '0' : '1',
-          });
+          Reflect.set(data.record, 'receiverType', data.record.receiverType === '全部' ? '0' : '1');
+          if (data.record.receiverType === '1') {
+            const organizationId = data.record.pointId.split(',');
+            Reflect.set(data.record, 'organizationId', organizationId);
+          }
+          setFieldsValue(data.record);
         }
       });
       // 发布通知
       const handleSend = async () => {
         await validate();
         const field = getFieldsValue();
-        const pointId = field.receiverType === '1' ? [field.organizationId] : [];
+        const pointId = field.receiverType === '1' ? field.organizationId + '' : null;
         // 新增情况
         if (!unref(isUpdate)) {
           const addNotice = {
@@ -206,7 +88,7 @@
       const handleSaveDraft = async () => {
         await validate();
         const field = getFieldsValue();
-        const pointId = field.receiverType === '1' ? [field.organizationId] : [];
+        const pointId = field.receiverType === '1' ? field.organizationId + '' : null;
         if (!unref(isUpdate)) {
           const saveDraft = {
             ...field,

@@ -66,9 +66,7 @@
             console.log(result);
             Reflect.set(data.record, 'roleIds', result);
             Reflect.set(data.record, 'password', '******');
-            setFieldsValue({
-              ...data.record,
-            });
+            setFieldsValue(data.record);
           });
           const organizationParams = new RoleOrOrganizationParam(rowId.value, false, true);
           checkGroup.value = await findCurrentUserRelation(organizationParams);

 import { getAllRoleList, isAccountExist } from '/@/api/system/system';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { emailRule, phoneRule } from '/@/utils/rules';
+import { emailRule, phoneRule, ChineseRegexp, EmailRegexp } from '/@/utils/rules';
 
 export const columns: BasicColumn[] = [
   {
@@ -68,14 +68,14 @@ export const accountFormSchema: FormSchema[] = [
     dynamicRules: ({ values }) => {
       return [
         {
-          message: '请输入用户名',
-          required: true,
-        },
-        {
           validator(_, value) {
             return new Promise((resolve, reject) => {
               if (value == '') {
                 reject('请输入用户名');
+              } else if (ChineseRegexp.test(value)) {
+                reject('用户名不能含有中文');
+              } else if (EmailRegexp.test(value)) {
+                reject('用户名不能为电子邮箱格式');
               } else {
                 if (values.username != undefined && values.id == undefined) {
                   isAccountExist(value).then((data) => {

@@ -37,26 +37,26 @@
         },
         {
           field: 'username',
-          label: '账号:',
+          label: '账号',
           required: true,
           component: 'Input',
         },
         {
           field: 'realName',
-          label: '真实名字:',
+          label: '真实名字',
           required: true,
           component: 'Input',
         },
         {
           field: 'phoneNumber',
-          label: '电话号码:',
+          label: '电话号码',
           required: true,
           component: 'Input',
           rules: phoneRule,
         },
         {
           field: 'email',
-          label: '邮件:',
+          label: '邮件',
           required: true,
           component: 'Input',
           rules: emailRule,
@@ -86,11 +86,14 @@
           await resetFields();
           isUpdate.value = !!data?.isUpdate;
           tenantId.value = data?.tenantId;
-          await updateSchema({ field: 'title', componentProps: { disabled: false } });
+
           if (unref(isUpdate)) {
+            await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await setFieldsValue({
               ...data.record,
             });
+          } else {
+            await updateSchema({ field: 'username', componentProps: { disabled: false } });
           }
         }
       );