Merge branch 'dev' into professional2

合并1. 新增分类弹窗取消按钮增加多语言 2. 添加属性后再次添加时，数据类型字端没有做重置导致的bug处理

src/views/iot/device/category/component/addOrEdit.vue

@@ -42,7 +42,7 @@
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
-					<el-button @click="onCancel">{{ $t('message.tableI18nAction.cancel‌') }}</el-button>
+					<el-button @click="onCancel">{{ $t('message.tableI18nAction.cancel') }}</el-button>
 					<el-button type="primary" @click="onSubmit" :loading="loading">{{ ruleForm.id ? $t('message.tableI18nAction.edit') : $t('message.tableI18nAction.add') }}</el-button>
 				</span>
 			</template>

src/views/iot/device/product/component/editAttr.vue

@@ -322,7 +322,7 @@ const rules = computed(() => ({
 	// 请选择是否只读
 	accessMode: [{ required: true, message: t('message.device.rules.accessMode'), trigger: 'blur' }],
 	// 请选择数据类型
-	type: [{ required: true, message: t('message.device.rules.selectDataType'), trigger: 'blur' }],
+	type: [{ required: true, message: t('message.device.rules.dataType'), trigger: 'blur' }],
 }))
 const ruleForm = ref<any>({
 	id: 0,
@@ -404,6 +404,7 @@ const openDialog = (row: any, productKeys: string | null) => {
 	isShowDialog.value = true
 }
 const resetForm = () => {
+	valueType.value = JSON.parse(JSON.stringify(valueTypeModule))
 	ruleForm.value = {
 		name: '',
 		key: '',
@@ -415,7 +416,6 @@ const resetForm = () => {
 	}
 	type.value = ''
 	types.value = ''
-	valueType.value = JSON.parse(JSON.stringify(valueType.value))
 	elementType.value = JSON.parse(JSON.stringify(valueType.value))
 	jsondata.value = []
 	enumdata.value = [