Merge branch 'ww' into 'main'

fix: BUG in teambition

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

@@ -122,11 +122,11 @@ export const addDataComponent = (params: AddDataComponentParams) => {
  * @param params
  * @param params
  * @returns
  * @returns
  */
  */
-export const deleteDataComponent = (params: string[]) => {
+export const deleteDataComponent = (params: string) => {
   return defHttp.delete({
   return defHttp.delete({
-    url: DataComponentUrl.DELETE_DATA_COMPONENT,
+    url: `${DataComponentUrl.DELETE_DATA_COMPONENT}/${params}`,
     params: {
     params: {
-      ids: params,
+      ids: [params],
     },
     },
   });
   });
 };
 };

@@ -111,7 +111,6 @@
     initChart();
     initChart();
     props.add && props.add(props.value.id, update);
     props.add && props.add(props.value.id, update);
     if (props.random) timeout = setInterval(handleRandomValue, 2000) as unknown as number;
     if (props.random) timeout = setInterval(handleRandomValue, 2000) as unknown as number;
-    console.log(unref(chartRef));
   });
   });
 
 
   onUnmounted(() => {
   onUnmounted(() => {

@@ -65,7 +65,7 @@
         <Tooltip :title="item.deviceName" placement="topLeft">
         <Tooltip :title="item.deviceName" placement="topLeft">
           <span>
           <span>
             <SvgIcon name="" prefix="iconfont" class="!fill-emerald-400" />
             <SvgIcon name="" prefix="iconfont" class="!fill-emerald-400" />
-            <span>{{ item.deviceName }}</span>
+            <span>{{ item.deviceRename || item.deviceName }}</span>
           </span>
           </span>
         </Tooltip>
         </Tooltip>
       </div>
       </div>

@@ -26,10 +26,6 @@
 
 
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
 
 
-  // const componentRecord = reactive<DataBoardLayoutInfo>({
-  //   ...props.record,
-  // } as unknown as DataBoardLayoutInfo);
-
   const dataSource = ref<DataSourceEl[]>([
   const dataSource = ref<DataSourceEl[]>([
     { id: buildUUID(), componentInfo: props.defaultConfig || {} } as unknown as DataSourceEl,
     { id: buildUUID(), componentInfo: props.defaultConfig || {} } as unknown as DataSourceEl,
   ]);
   ]);
@@ -49,6 +45,11 @@
     }
     }
   };
   };
 
 
+  const validate = async () => {
+    await basicMethod.validate();
+    await validateDataSourceField();
+  };
+
   const getAllDataSourceFieldValue = () => {
   const getAllDataSourceFieldValue = () => {
     const _dataSource = getDataSourceField();
     const _dataSource = getDataSourceField();
     const basicInfo = basicMethod.getFieldsValue();
     const basicInfo = basicMethod.getFieldsValue();
@@ -58,6 +59,16 @@
     };
     };
   };
   };
 
 
+  const validateDataSourceField = async () => {
+    const hasExistEl = Object.keys(dataSourceEl).filter((key) => dataSourceEl[key]);
+    const _dataSource: boolean[] = [];
+    for (const id of hasExistEl) {
+      const flag = (await (dataSourceEl[id] as FormActionType).validate()) as boolean;
+      _dataSource.push(flag);
+    }
+    return _dataSource;
+  };
+
   const getDataSourceField = () => {
   const getDataSourceField = () => {
     const hasExistEl = Object.keys(dataSourceEl).filter((key) => dataSourceEl[key]);
     const hasExistEl = Object.keys(dataSourceEl).filter((key) => dataSourceEl[key]);
     const _dataSource: DataSource[] = [];
     const _dataSource: DataSource[] = [];
@@ -66,7 +77,7 @@
       const value = (dataSourceEl[id] as FormActionType).getFieldsValue() as DataSource;
       const value = (dataSourceEl[id] as FormActionType).getFieldsValue() as DataSource;
       if (!~index) continue;
       if (!~index) continue;
       const componentInfo = unref(dataSource)[index].componentInfo || {};
       const componentInfo = unref(dataSource)[index].componentInfo || {};
-      _dataSource.push({
+      _dataSource.unshift({
         ...value,
         ...value,
         componentInfo: { ...(props.defaultConfig || {}), ...componentInfo },
         componentInfo: { ...(props.defaultConfig || {}), ...componentInfo },
       });
       });
@@ -90,6 +101,7 @@
     });
     });
     await nextTick();
     await nextTick();
     (dataSourceEl[copyRecordId] as FormActionType).setFieldsValue(value);
     (dataSourceEl[copyRecordId] as FormActionType).setFieldsValue(value);
+    (dataSourceEl[copyRecordId] as FormActionType).clearValidate();
   };
   };
 
 
   const [registerVisualOptionModal, { openModal }] = useModal();
   const [registerVisualOptionModal, { openModal }] = useModal();
@@ -128,6 +140,7 @@
 
 
   const echoDataSource = () => {
   const echoDataSource = () => {
     basicMethod.setFieldsValue(props.record.record);
     basicMethod.setFieldsValue(props.record.record);
+    basicMethod.clearValidate();
     dataSource.value = [];
     dataSource.value = [];
     dataSource.value = props.record.record.dataSource.map((item) => {
     dataSource.value = props.record.record.dataSource.map((item) => {
       const id = buildUUID();
       const id = buildUUID();
@@ -139,6 +152,7 @@
 
 
       nextTick(() => {
       nextTick(() => {
         (dataSourceEl[id] as FormActionType).setFieldsValue(item);
         (dataSourceEl[id] as FormActionType).setFieldsValue(item);
+        (dataSourceEl[id] as FormActionType).clearValidate();
       });
       });
       return {
       return {
         id,
         id,
@@ -165,6 +179,7 @@
 
 
   defineExpose({
   defineExpose({
     getAllDataSourceFieldValue,
     getAllDataSourceFieldValue,
+    validate,
   });
   });
 </script>
 </script>
 
 

@@ -44,6 +44,7 @@
 
 
   const basicConfigurationEl = ref<{
   const basicConfigurationEl = ref<{
     getAllDataSourceFieldValue: Fn<any, Recordable>;
     getAllDataSourceFieldValue: Fn<any, Recordable>;
+    validate: Fn;
   }>();
   }>();
 
 
   const resetForm = () => {
   const resetForm = () => {
@@ -53,8 +54,9 @@
     componentDefaultConfig.value = {};
     componentDefaultConfig.value = {};
   };
   };
 
 
-  const handleSubmit = () => {
-    const { getAllDataSourceFieldValue } = unref(basicConfigurationEl)!;
+  const handleSubmit = async () => {
+    const { getAllDataSourceFieldValue, validate } = unref(basicConfigurationEl)!;
+    await validate();
     const value = getAllDataSourceFieldValue();
     const value = getAllDataSourceFieldValue();
     unref(isEdit) ? handleUpdateComponent(value) : handleAddComponent(value);
     unref(isEdit) ? handleUpdateComponent(value) : handleAddComponent(value);
     resetForm();
     resetForm();

@@ -32,6 +32,7 @@ export const basicSchema: FormSchema[] = [
     field: BasicConfigField.NAME,
     field: BasicConfigField.NAME,
     label: '组件名称',
     label: '组件名称',
     component: 'Input',
     component: 'Input',
+    rules: [{ required: true, message: '组件名称为必填项' }],
     componentProps: {
     componentProps: {
       placeholder: '请输入组件名称',
       placeholder: '请输入组件名称',
     },
     },
@@ -40,6 +41,7 @@ export const basicSchema: FormSchema[] = [
     field: BasicConfigField.REMARK,
     field: BasicConfigField.REMARK,
     label: '组件备注',
     label: '组件备注',
     component: 'InputTextArea',
     component: 'InputTextArea',
+    // rules: [{ required: true, message: '组件备注为必填项' }],
     componentProps: {
     componentProps: {
       placeholder: '请输入组件备注',
       placeholder: '请输入组件备注',
     },
     },
@@ -64,6 +66,7 @@ export const dataSourceSchema: FormSchema[] = [
     component: 'ApiTreeSelect',
     component: 'ApiTreeSelect',
     label: '组织',
     label: '组织',
     colProps: { span: 8 },
     colProps: { span: 8 },
+    rules: [{ required: true, message: '组织为必填项' }],
     componentProps({ formActionType }) {
     componentProps({ formActionType }) {
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       return {
       return {
@@ -90,6 +93,7 @@ export const dataSourceSchema: FormSchema[] = [
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '设备',
     label: '设备',
     colProps: { span: 8 },
     colProps: { span: 8 },
+    rules: [{ required: true, message: '设备名称为必填项' }],
     componentProps({ formModel, formActionType }) {
     componentProps({ formModel, formActionType }) {
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       const organizationId = formModel[DataSourceField.ORIGINATION_ID];
       const organizationId = formModel[DataSourceField.ORIGINATION_ID];
@@ -126,6 +130,7 @@ export const dataSourceSchema: FormSchema[] = [
     label: '网关子设备',
     label: '网关子设备',
     component: 'ApiSelect',
     component: 'ApiSelect',
     colProps: { span: 8 },
     colProps: { span: 8 },
+    rules: [{ required: true, message: '网关子设备为必填项' }],
     ifShow({ model }) {
     ifShow({ model }) {
       return model[DataSourceField.IS_GATEWAY_DEVICE];
       return model[DataSourceField.IS_GATEWAY_DEVICE];
     },
     },
@@ -168,6 +173,7 @@ export const dataSourceSchema: FormSchema[] = [
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '属性',
     label: '属性',
     colProps: { span: 8 },
     colProps: { span: 8 },
+    rules: [{ required: true, message: '属性为必填项' }],
     componentProps({ formModel }) {
     componentProps({ formModel }) {
       const organizationId = formModel[DataSourceField.ORIGINATION_ID];
       const organizationId = formModel[DataSourceField.ORIGINATION_ID];
       const isGatewayDevice = formModel[DataSourceField.IS_GATEWAY_DEVICE];
       const isGatewayDevice = formModel[DataSourceField.IS_GATEWAY_DEVICE];

@@ -177,21 +177,23 @@
     openModal(true, { isEdit: false });
     openModal(true, { isEdit: false });
   };
   };
 
 
+  const getLayoutInfo = () => {
+    return unref(dataBoardList).map((item) => {
+      return {
+        id: item.i,
+        h: item.h,
+        w: item.w,
+        x: item.x,
+        y: item.y,
+      } as Layout;
+    });
+  };
+
   const handleSaveLayoutInfo = async () => {
   const handleSaveLayoutInfo = async () => {
     try {
     try {
-      const layoutInfo = unref(dataBoardList).map((item) => {
-        return {
-          id: item.i,
-          h: item.h,
-          w: item.w,
-          x: item.x,
-          y: item.y,
-        } as Layout;
-      });
-
       await updateDataBoardLayout({
       await updateDataBoardLayout({
         boardId: unref(getBoardId),
         boardId: unref(getBoardId),
-        layout: layoutInfo,
+        layout: getLayoutInfo(),
       });
       });
     } catch (error) {}
     } catch (error) {}
   };
   };
@@ -231,7 +233,6 @@
 
 
       if (!data.data.componentData) {
       if (!data.data.componentData) {
         dataBoardList.value = [];
         dataBoardList.value = [];
-        console.log(unref(dataBoardList));
         return;
         return;
       }
       }
       dataBoardList.value = data.data.componentData.map((item) => {
       dataBoardList.value = data.data.componentData.map((item) => {
@@ -311,7 +312,7 @@
   const handleCopy = async (id: string) => {
   const handleCopy = async (id: string) => {
     const record = unref(dataBoardList).find((item) => item.i === id);
     const record = unref(dataBoardList).find((item) => item.i === id);
     try {
     try {
-      await addDataComponent({
+      const data = await addDataComponent({
         boardId: unref(getBoardId),
         boardId: unref(getBoardId),
         record: {
         record: {
           dataBoardId: unref(getBoardId),
           dataBoardId: unref(getBoardId),
@@ -320,14 +321,31 @@
         },
         },
       });
       });
       createMessage.success('复制成功');
       createMessage.success('复制成功');
-      getDataBoardComponent();
+      const _id = data.data.id;
+      const layoutInfo = getLayoutInfo();
+
+      layoutInfo.push({
+        id: _id,
+        h: record?.h,
+        w: record?.w,
+        x: record?.x,
+        y: record?.y,
+      } as Layout);
+
+      await updateDataBoardLayout({
+        boardId: unref(getBoardId),
+        layout: layoutInfo,
+      });
+
+      await getDataBoardComponent();
     } catch (error) {}
     } catch (error) {}
   };
   };
 
 
   const handleDelete = async (id: string) => {
   const handleDelete = async (id: string) => {
     try {
     try {
-      await deleteDataComponent([id]);
+      await deleteDataComponent(id);
       createMessage.success('删除成功');
       createMessage.success('删除成功');
+      await handleSaveLayoutInfo();
       await getDataBoardComponent();
       await getDataBoardComponent();
     } catch (error) {
     } catch (error) {
       // createMessage.error('删除失败');
       // createMessage.error('删除失败');