Merge branch 'fix/types-import-error' into 'main_dev'

fix: 修复项目运行时类型引入报错

See merge request yunteng/thingskit-front!636

@@ -6,6 +6,7 @@ import { DeviceCascadePickerValueType } from '../DevicePicker';
 import { TaskTargetEnum } from '../../config';
 import { TimeUnitEnum } from '/@/enums/toolEnum';
 import { ProductCascadePickerValueType } from '../ProductPicker';
+import { toRaw } from 'vue';
 
 export interface FormValueType extends Partial<Record<FormFieldsEnum, any>> {
   [FormFieldsEnum.EXECUTE_TARGET_DATA]: DeviceCascadePickerValueType;
@@ -123,6 +124,7 @@ export const parseData = (result: TaskRecordType): Required<FormValueType> => {
     TaskRecordType['executeTarget']
   >;
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
+  console.log(pushWay === PushWayEnum.MQTT ? JSON.stringify(rpcCommand, null, 2) : rpcCommand);
   return {
     name,
     targetType,
@@ -131,7 +133,7 @@ export const parseData = (result: TaskRecordType): Required<FormValueType> => {
     pushWay,
     executeContentType,
     executeTargetData: {
-      deviceId: targetType === TaskTargetEnum.DEVICES ? data : [],
+      deviceId: targetType === TaskTargetEnum.DEVICES ? toRaw(data) : [],
       deviceProfileId,
       deviceType,
       organizationId,

@@ -3,11 +3,9 @@
   import { JSONEditor } from '/@/components/CodeEditor';
   import { SettingOutlined } from '@ant-design/icons-vue';
   import { ModeEnum } from './index';
-  import { computed } from '@vue/reactivity';
   import GenModbusCommandModal from './GenModbusCommandModal.vue';
   import { useModal } from '/@/components/Modal';
-  import { ref } from 'vue';
-  import { unref } from 'vue';
+  import { ref, unref } from 'vue';
 
   const props = withDefaults(
     defineProps<{
@@ -30,10 +28,6 @@
 
   const [registerCreateTCPCommandModal, { openModal }] = useModal();
 
-  const getJSONValue = computed(() => {
-    return props.value;
-  });
-
   const handleEmit = (value: any) => {
     emit('update:value', value);
     openModal(false);
@@ -63,7 +57,7 @@
     <Input
       v-if="mode === ModeEnum.NORMAL"
       ref="inputElRef"
-      :value="getJSONValue"
+      :value="value"
       @change="handleEmit"
       v-bind="inputProps"
       @focus="handleFocus"
@@ -74,7 +68,7 @@
     </Input>
     <JSONEditor
       v-if="mode === ModeEnum.JSON"
-      :value="getJSONValue"
+      :value="value"
       @update:value="handleUpdateEditorValue"
     />
     <GenModbusCommandModal @register="registerCreateTCPCommandModal" @update:value="handleEmit" />

@@ -13,7 +13,6 @@
   import { reactive } from 'vue';
   import { ReloadOutlined } from '@ant-design/icons-vue';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
-  import { ModalParamsType } from '/#/utils';
   import { Authority } from '/@/components/Authority';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import { RunTaskModal } from './components/RunTaskModal';

@@ -7,6 +7,8 @@ import type {
   PropType as VuePropType,
 } from 'vue';
 
+import { DataActionModeEnum } from '/@/enums/toolEnum';
+
 declare global {
   const __APP_INFO__: {
     pkg: {
@@ -17,6 +19,12 @@ declare global {
     };
     lastBuildTime: string;
   };
+
+  declare interface ModalParamsType<T = Recordable> {
+    mode: DataActionModeEnum;
+    record: T;
+    [key: string]: any;
+  }
   // declare interface Window {
   //   // Global vue app instance
   //   __APP__: App<Element>;