Merge branch 'ww' into 'main'

fix: DEFECT-828 send command params it could be string or it could be json

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

-import { Plugin } from 'vite';
-
-export function dropConsoleInVue3VideoPlayPlugin(params?: { enabled: boolean }) {
-  const { enabled = true } = params || {};
-  return {
-    name: 'drop-console-in-vue3-video-play-plugin',
-    transform(src, id) {
-      if (enabled) {
-        if (id.includes('vue3-video-play')) {
-          return {
-            code: src.replaceAll('console.log', ''),
-          };
-        }
-      }
-    },
-  } as Plugin;
-}

@@ -16,7 +16,6 @@ import { configThemePlugin } from './theme';
 import { configImageminPlugin } from './imagemin';
 import { configImageminPlugin } from './imagemin';
 import { configSvgIconsPlugin } from './svgSprite';
 import { configSvgIconsPlugin } from './svgSprite';
 import { configHmrPlugin } from './hmr';
 import { configHmrPlugin } from './hmr';
-import { dropConsoleInVue3VideoPlayPlugin } from './dropConsoleInVue3VideoPlay';
 
 
 export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
 export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   const {
   const {
@@ -64,8 +63,6 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   //vite-plugin-theme
   //vite-plugin-theme
   vitePlugins.push(configThemePlugin(isBuild));
   vitePlugins.push(configThemePlugin(isBuild));
 
 
-  vitePlugins.push(dropConsoleInVue3VideoPlayPlugin());
-
   // The following plugins only work in the production environment
   // The following plugins only work in the production environment
   if (isBuild) {
   if (isBuild) {
     //vite-plugin-imagemin
     //vite-plugin-imagemin

@@ -70,7 +70,6 @@
     "vue-router": "^4.0.11",
     "vue-router": "^4.0.11",
     "vue-types": "^4.0.3",
     "vue-types": "^4.0.3",
     "vue3-grid-layout": "^1.0.0",
     "vue3-grid-layout": "^1.0.0",
-    "vue3-video-play": "^1.3.1-beta.4",
     "xlsx": "^0.17.0"
     "xlsx": "^0.17.0"
   },
   },
   "devDependencies": {
   "devDependencies": {

@@ -5,7 +5,6 @@
   import { Spin, Button, Pagination, Space, List } from 'ant-design-vue';
   import { Spin, Button, Pagination, Space, List } from 'ant-design-vue';
   import { cameraPage } from '/@/api/camera/cameraManager';
   import { cameraPage } from '/@/api/camera/cameraManager';
   import { CameraRecord } from '/@/api/camera/model/cameraModel';
   import { CameraRecord } from '/@/api/camera/model/cameraModel';
-  import 'vue3-video-play/dist/style.css';
   import { useFullscreen } from '@vueuse/core';
   import { useFullscreen } from '@vueuse/core';
   import CameraDrawer from './CameraDrawer.vue';
   import CameraDrawer from './CameraDrawer.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';

@@ -689,9 +689,39 @@ export const CommandSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'valueType',
+    label: '命令类型',
+    component: 'RadioGroup',
+    defaultValue: 'json',
+    componentProps: () => {
+      return {
+        options: [
+          { label: 'JSON', value: 'json' },
+          { label: '字符串', value: 'string' },
+        ],
+      };
+    },
+  },
+  {
+    field: 'commandText',
+    label: '请输入命令内容',
+    ifShow: ({ model }) => {
+      return model['valueType'] === 'string';
+    },
+    component: 'InputTextArea',
+    componentProps: {
+      autosize: {
+        minRows: 6,
+      },
+    },
+  },
+  {
     field: 'commandValue',
     field: 'commandValue',
     label: '请输入命令内容',
     label: '请输入命令内容',
     slot: 'commandSlot',
     slot: 'commandSlot',
     component: 'InputTextArea',
     component: 'InputTextArea',
+    show: ({ model }) => {
+      return model['valueType'] === 'json';
+    },
   },
   },
 ];
 ];

@@ -30,6 +30,14 @@
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { Tooltip } from 'ant-design-vue';
   import { Tooltip } from 'ant-design-vue';
 
 
+  interface CommandParams {
+    additionalInfo: Recordable;
+    cmdType: string;
+    method: string;
+    params: string | Recordable;
+    persistent: boolean;
+  }
+
   export default defineComponent({
   export default defineComponent({
     components: { BasicForm, Button, QuestionCircleOutlined, Tooltip },
     components: { BasicForm, Button, QuestionCircleOutlined, Tooltip },
     props: {
     props: {
@@ -41,7 +49,7 @@
     emits: ['register'],
     emits: ['register'],
     setup(props) {
     setup(props) {
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
-      const jsonData: any = ref({});
+      const jsonData = ref<CommandParams>({} as unknown as CommandParams);
       const disable = ref(false);
       const disable = ref(false);
       const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
       const [registerForm, { getFieldsValue, validate, resetFields }] = useForm({
         labelWidth: 100,
         labelWidth: 100,
@@ -82,13 +90,17 @@
           if (!valid) return;
           if (!valid) return;
           // 收集表单数据
           // 收集表单数据
           const field = getFieldsValue();
           const field = getFieldsValue();
-          const getJson = unref(jsonInstance).get();
+          if (field.valueType === 'json') {
+            const getJson = unref(jsonInstance).get();
+            jsonData.value.params = getJson;
+          } else {
+            jsonData.value.params = field.commandText;
+          }
           jsonData.value.persistent = true;
           jsonData.value.persistent = true;
           jsonData.value.additionalInfo = {
           jsonData.value.additionalInfo = {
             cmdType: 'API',
             cmdType: 'API',
           };
           };
           jsonData.value.method = 'methodThingskit';
           jsonData.value.method = 'methodThingskit';
-          jsonData.value.params = { ...getJson };
           commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
           commandIssuanceApi(field.commandType, props.deviceDetail.tbDeviceId, jsonData.value)
             .then((res) => {
             .then((res) => {
               if (!res) return;
               if (!res) return;

@@ -4,12 +4,12 @@
       ref="formRef"
       ref="formRef"
       :model="scriptForm"
       :model="scriptForm"
       name="basic"
       name="basic"
-      :label-col="{ span: 3 }"
-      :wrapper-col="{ span: 17 }"
+      :label-col="{ span: 4 }"
+      :wrapper-col="{ span: 16 }"
       autocomplete="off"
       autocomplete="off"
     >
     >
       <a-form-item
       <a-form-item
-        :label="ifAdd ? '名称' : '输入参数'"
+        :label="ifAdd ? '名称' : '输入参数(params)'"
         :name="ifAdd ? 'name' : 'params'"
         :name="ifAdd ? 'name' : 'params'"
         :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]"
         :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]"
       >
       >
@@ -42,7 +42,10 @@
           copy
           copy
         </Button>
         </Button>
       </a-form-item>
       </a-form-item>
-      <a-form-item :label="ifAdd ? '备注' : '输出参数'" :name="ifAdd ? 'description' : 'output'">
+      <a-form-item
+        :label="ifAdd ? '备注' : '输出参数(output)'"
+        :name="ifAdd ? 'description' : 'output'"
+      >
         <a-textarea
         <a-textarea
           :rows="3"
           :rows="3"
           v-if="ifAdd"
           v-if="ifAdd"

@@ -98,7 +98,7 @@
         }, 10);
         }, 10);
       } else {
       } else {
         if (res) {
         if (res) {
-          converScriptRef.value?.setScriptOutputData(res?.output);
+          converScriptRef.value?.setScriptOutputData(res?.output || res?.error);
         }
         }
       }
       }
       emits('success', res);
       emits('success', res);