Merge branch 'fix/DEFECT-1718' into 'main_dev'

模板和组态创建添加字段

See merge request yunteng/thingskit-front!975

@@ -26,7 +26,7 @@
           v-if="model['templateId']"
           ref="selectDeviceProfileRef"
           :selectOptions="selectOptions"
-          :organizationId="model['organizationId']"
+          :organizationId="model?.['organizationId']"
         />
       </template>
     </BasicForm>
@@ -71,12 +71,21 @@
         });
         await updateSchema({
           field: 'enableTemplate',
-          componentProps: {
-            disabled,
-            checkedValue: 1,
-            unCheckedValue: 0,
-            checkedChildren: '开',
-            unCheckedChildren: '关',
+          componentProps: ({ formActionType }) => {
+            return {
+              disabled,
+              checkedValue: 1,
+              unCheckedValue: 0,
+              checkedChildren: '开',
+              unCheckedChildren: '关',
+              onChange: () => {
+                formActionType.setFieldsValue({
+                  productIds: [],
+                  templateId: null,
+                  productId: undefined,
+                });
+              },
+            };
           },
         });
       };
@@ -139,20 +148,24 @@
           value: item.id,
         }));
       };
-
       const selectOptions: Ref<any[]> = ref([]);
 
       const handleTemplateChange = async (_, option) => {
         const { productAndDevice } = option;
-        if (!productAndDevice) return;
-        selectOptions.value = productAndDevice.map((item) => ({
-          label: item.name,
-          value: item.profileId,
-        }));
+        // if (!productAndDevice) return;
+        // selectOptions.value = productAndDevice?.map((item) => ({
+        //   label: item.profileName || item.name,
+        //   value: item.profileId,
+        // }));
         await nextTick();
         // 赋值
         selectDeviceProfileRef.value?.setFieldsValue(
-          productAndDevice.map((item) => ({ label: item.name, value: item.profileId }))
+          productAndDevice?.map((item) => ({
+            label: item.profileName || item.name,
+            value: item.profileId,
+            transportType: item?.transportType,
+            deviceType: item?.deviceType,
+          }))
         );
       };
       //
@@ -170,7 +183,12 @@
       const getCurrentAllProduct = async (products: string[]) => {
         const resp = (await getDeviceProfile()) as any;
         if (!resp) return;
-        const values = resp?.map((item) => ({ name: item.name, profileId: item.id }));
+        const values = resp?.map((item) => ({
+          name: item.name,
+          profileId: item.id,
+          deviceType: item.deviceType,
+          transportType: item.transportType,
+        }));
         return values.filter((item) => products?.includes(item.profileId));
       };
 

@@ -152,14 +152,17 @@ export const formSchema: FormSchema[] = [
     defaultValue: 0,
     componentProps: ({ formActionType }) => {
       const { setFieldsValue } = formActionType;
+
       return {
         checkedValue: 1,
         unCheckedValue: 0,
         checkedChildren: '开',
         unCheckedChildren: '关',
-        onChange() {
+        onChange: () => {
           setFieldsValue({
             productIds: [],
+            templateId: null,
+            productId: undefined,
           });
         },
       };
@@ -180,6 +183,7 @@ export const formSchema: FormSchema[] = [
     field: 'templateId', //暂且使用插槽形式
     label: '模板',
     component: 'Input',
+    required: true,
     slot: 'templateId',
     colProps: { span: 24 },
     ifShow: ({ values }) => values['enableTemplate'] === 1,
@@ -193,14 +197,6 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => values['enableTemplate'] === 1 && values['templateId'],
   },
   {
-    field: 'deviceIds', //暂且使用插槽形式
-    label: '设备',
-    component: 'Input',
-    slot: 'deviceIds',
-    colProps: { span: 24 },
-    ifShow: ({ values }) => values['enableTemplate'] === 1 && values['templateId'],
-  },
-  {
     field: 'productId',
     label: '产品',
     component: 'ApiSelect',

@@ -53,6 +53,8 @@
       dynamicInput.params.push({
         name: props.value.label,
         profileId: props.value.value,
+        deviceType: props.value?.deviceType,
+        transportType: props.value?.transportType,
         deviceList: props.value.deviceList?.filter(Boolean)?.map((item) => item.deviceId),
       });
     }
@@ -67,17 +69,20 @@
 
   //chang改变
   const emitChange = () => {
-    const findDeviceDict = selectOptions.value.map((item) => {
-      if (dynamicInput.params[0].deviceList?.includes(item.value)) {
-        return {
-          name: item.label,
-          deviceId: item.value,
-        };
-      }
+    const tempDeviceList: Recordable[] = []; // fix: 修改选择设备顺序问题
+    dynamicInput.params[0].deviceList?.forEach((item) => {
+      selectOptions.value?.forEach((newItem) => {
+        if (item === newItem.value) {
+          tempDeviceList.push({
+            name: newItem.label,
+            deviceId: newItem.value,
+          });
+        }
+      });
     });
     return {
       ...dynamicInput.params[0],
-      deviceList: findDeviceDict.filter(Boolean),
+      deviceList: tempDeviceList.filter(Boolean), // 过滤假值
     };
   };
   defineExpose({

@@ -56,12 +56,8 @@
 
   const setFieldsValue = async (productIds) => {
     await nextTick();
-    if (!productIds && !productIds.length) {
-      return;
-    }
-    selectValue.value = productIds;
-
-    profileList.value = productIds;
+    selectValue.value = productIds || [];
+    profileList.value = productIds || [];
   };
 
   const setValue = (value: any) => {

@@ -71,7 +71,12 @@
       const getCurrentAllProduct = async (products: string[]) => {
         const resp = (await getDeviceProfile()) as any;
         if (!resp) return;
-        const values = resp.map((item) => ({ name: item.name, profileId: item.id }));
+        const values = resp.map((item) => ({
+          name: item.name,
+          profileId: item.id,
+          deviceType: item.deviceType,
+          transportType: item.transportType,
+        }));
         return values.filter((item) => products.includes(item.profileId));
       };