Merge branch 'local_dev_branch_by_ft' into 'main_dev'

feat: 组态新增一个字段 codeType

See merge request yunteng/thingskit-front!977

@@ -46,6 +46,7 @@
           deviceProfileId: props.value.value,
           deviceProfileId: props.value.value,
         });
         });
         selectOptions.value = resp.map((item) => ({
         selectOptions.value = resp.map((item) => ({
+          ...item,
           label: item.alias || item.name,
           label: item.alias || item.name,
           value: item.tbDeviceId,
           value: item.tbDeviceId,
         }));
         }));
@@ -76,6 +77,7 @@
           tempDeviceList.push({
           tempDeviceList.push({
             name: newItem.label,
             name: newItem.label,
             deviceId: newItem.value,
             deviceId: newItem.value,
+            codeType: newItem.codeType,
           });
           });
         }
         }
       });
       });

@@ -30,7 +30,7 @@ export const PHONE_DEFAULT_CONTENT =
 // 表格列数据
 // 表格列数据
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
-    title: '组态名称',
+    title: '模板名称',
     dataIndex: 'name',
     dataIndex: 'name',
     width: 120,
     width: 120,
   },
   },
@@ -73,12 +73,12 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
 export const searchFormSchema: FormSchema[] = [
   {
   {
     field: 'name',
     field: 'name',
-    label: '组态名称',
+    label: '模板名称',
     component: 'Input',
     component: 'Input',
     colProps: { span: 8 },
     colProps: { span: 8 },
     componentProps: {
     componentProps: {
       maxLength: 36,
       maxLength: 36,
-      placeholder: '请输入组态名称',
+      placeholder: '请输入模板名称',
     },
     },
   },
   },
 ];
 ];