Merge branch 'local_devbranch_byft' into 'main_dev'

fix: DEFECT-1768 新增租户后的产品界面置底和查询出来的界面也置底显示,图二为正常显示

See merge request yunteng/thingskit-front!1018

@@ -96,6 +96,10 @@
                 top: '48%',
                 top: '48%',
                 z: 10,
                 z: 10,
                 style: {
                 style: {
+                  width: 35,
+                  textAlign: 'left',
+                  overflow: 'truncate',
+                  textVerticalAlign: 'middle',
                   fill: '#1a1a1a',
                   fill: '#1a1a1a',
                   text: value + '个',
                   text: value + '个',
                   font: '0.85rem Microsoft YaHei',
                   font: '0.85rem Microsoft YaHei',

@@ -312,7 +312,7 @@ export const step1Schemas: FormSchema[] = [
   {
   {
     field: 'organizationId',
     field: 'organizationId',
     label: '所属组织',
     label: '所属组织',
-    component: 'Input',
+    component: 'Select',
     required: true,
     required: true,
     slot: 'addOrg',
     slot: 'addOrg',
   },
   },

@@ -168,17 +168,27 @@
       const devicePic = ref('');
       const devicePic = ref('');
       const loading = ref(false);
       const loading = ref(false);
 
 
-      const [register, { validate, resetFields, setFieldsValue, getFieldsValue, updateSchema }] =
-        useForm({
-          labelWidth: 140,
-          schemas: step1Schemas,
-          actionColOptions: {
-            span: 14,
-          },
-          labelAlign: 'right',
-          showResetButton: false,
-          showSubmitButton: false,
-        });
+      const [
+        register,
+        {
+          validate,
+          resetFields,
+          setFieldsValue,
+          getFieldsValue,
+          updateSchema,
+          clearValidate,
+          validateFields,
+        },
+      ] = useForm({
+        labelWidth: 140,
+        schemas: step1Schemas,
+        actionColOptions: {
+          span: 14,
+        },
+        labelAlign: 'right',
+        showResetButton: false,
+        showSubmitButton: false,
+      });
       async function nextStep() {
       async function nextStep() {
         try {
         try {
           let values = await validate();
           let values = await validate();
@@ -447,11 +457,11 @@
         });
         });
       }
       }
 
 
-      const handleTreeOrg = () => {
-        // const clearGatewayId = {
-        //   gatewayId: '',
-        // };
-        // setFieldsValue(clearGatewayId);
+      const handleTreeOrg = (option: string) => {
+        if (option) clearValidate('organizationId');
+        else {
+          validateFields(['organizationId']);
+        }
       };
       };
 
 
       return {
       return {

@@ -322,4 +322,8 @@
   .profile-list:deep(.ant-card-body) {
   .profile-list:deep(.ant-card-body) {
     @apply !p-4;
     @apply !p-4;
   }
   }
+
+  :deep(.ant-spin-nested-loading) {
+    height: 40rem;
+  }
 </style>
 </style>