merge: merge code resolve conflice

@@ -25,11 +25,28 @@
           </div>
         </Upload>
       </template>
+      <template #videoPlatformIdSlot="{ model, field }">
+        <a-select
+          placeholder="请选择流媒体配置"
+          v-model:value="model[field]"
+          :options="streamConfigOptions.map((item) => ({ value: item.value, label: item.label }))"
+        >
+          <template #dropdownRender="{ menuNode: menu }">
+            <v-nodes :vnodes="menu" />
+            <a-divider style="margin: 4px 0" />
+            <div @click="handleOpenStreamConfig" style="padding: 4px 8px; cursor: pointer">
+              <plus-outlined />
+              新增流媒体配置
+            </div>
+          </template>
+        </a-select>
+      </template>
     </BasicForm>
   </BasicDrawer>
+  <SteramingDrawer @register="registerSteramingDrawer" @success="handleSuccess" />
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
+  import { defineComponent, ref, computed, unref, nextTick, onMounted } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
@@ -39,14 +56,27 @@
   import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
   import { upload } from '/@/api/oss/ossFileUploader';
   import { FileItem } from '/@/components/Upload/src/typing';
+  import { getStreamingMediaList } from '/@/api/camera/cameraManager';
+  import SteramingDrawer from '../streaming/SteramingDrawer.vue';
+  import { useDrawer } from '/@/components/Drawer';
 
   export default defineComponent({
     name: 'ContactDrawer',
-    components: { BasicDrawer, BasicForm, Upload, PlusOutlined, LoadingOutlined },
+    components: {
+      BasicDrawer,
+      BasicForm,
+      Upload,
+      PlusOutlined,
+      LoadingOutlined,
+      SteramingDrawer,
+      VNodes: (_, { attrs }) => {
+        return attrs.vnodes;
+      },
+    },
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const loading = ref(false);
-
+      const streamConfigOptions: any = ref([]);
       const isUpdate = ref(true);
       const editId = ref('');
       const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
@@ -54,7 +84,32 @@
         schemas: formSchema,
         showActionButtonGroup: false,
       });
+      onMounted(async () => {
+        const res = await getStreamingMediaList({});
+        streamConfigOptions.value = res.map((m) => {
+          return {
+            label: m.host,
+            value: m.id,
+          };
+        });
+      });
+      const [registerSteramingDrawer, { openDrawer }] = useDrawer();
 
+      const handleOpenStreamConfig = () => {
+        openDrawer(true, {
+          createFlag: true,
+        });
+      };
+      async function handleSuccess() {
+        const res = await getStreamingMediaList({});
+        if (res) {
+          streamConfigOptions.value = res.map((m) => {
+            return { label: m.host, value: m.id };
+          });
+        } else {
+          streamConfigOptions.value = [];
+        }
+      }
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         await resetFields();
         setDrawerProps({ confirmLoading: false });
@@ -136,6 +191,10 @@
         beforeUpload,
         tenantLogo,
         loading,
+        streamConfigOptions,
+        registerSteramingDrawer,
+        handleOpenStreamConfig,
+        handleSuccess,
       };
     },
   });

@@ -4,7 +4,6 @@ import { copyTransFun } from '/@/utils/fnUtils';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
 
 import { CameraVideoUrl, CameraMaxLength, MediaTypeValidate } from '/@/utils/rules';
-import { getStreamingMediaList } from '/@/api/camera/cameraManager';
 import { h } from 'vue';
 import SnHelpMessage from './SnHelpMessage.vue';
 export enum AccessMode {
@@ -154,6 +153,7 @@ export const formSchema: QFormSchema[] = [
       return values.accessMode === AccessMode.ManuallyEnter;
     },
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入视频厂家',
     },
   },
@@ -167,6 +167,7 @@ export const formSchema: QFormSchema[] = [
       return values.accessMode === AccessMode.ManuallyEnter;
     },
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入摄像头编号',
     },
   },
@@ -188,15 +189,13 @@ export const formSchema: QFormSchema[] = [
   {
     field: 'videoPlatformId',
     label: '流媒体配置',
-    component: 'ApiSelect',
+    component: 'Select',
     ifShow({ values }) {
       return values.accessMode === AccessMode.Streaming;
     },
+    slot: 'videoPlatformIdSlot',
     componentProps: {
       placeholder: '请选择流媒体配置',
-      api: getStreamingMediaList,
-      labelField: 'host',
-      valueField: 'id',
     },
   },
   {

@@ -9,7 +9,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { PlayProtocol } from '../manage/config.data';
 
-  const emit = defineEmits(['success','register']);
+  const emit = defineEmits(['success', 'register']);
 
   const createFlag = ref(false);
 
@@ -23,7 +23,7 @@
     showActionButtonGroup: false,
   });
 
-  const [registerDrawer, { setDrawerProps }] = useDrawerInner((data: DrawerParams) => {
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner((data: DrawerParams) => {
     createFlag.value = data.createFlag;
     if (!unref(createFlag)) {
       id = data.record!.id;
@@ -48,6 +48,7 @@
       const { createMessage } = useMessage();
       createMessage.success(message);
       emit('success');
+      closeDrawer();
     } catch (e) {
     } finally {
       setDrawerProps({

@@ -101,6 +101,7 @@ export const formDetailSchema: FormSchema[] = [
     helpMessage: ['平台IP + 端口'],
     rules: [{ required: true, message: '平台地址为必填项' }],
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入平台地址',
     },
   },
@@ -110,6 +111,7 @@ export const formDetailSchema: FormSchema[] = [
     component: 'Input',
     rules: [{ required: true, message: '用户Key为必填项' }],
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入用户Key',
     },
   },
@@ -122,6 +124,7 @@ export const formDetailSchema: FormSchema[] = [
       { required: true, min: 20, message: '用户密钥不能少于20位字符' },
     ],
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入用户密钥',
     },
   },

@@ -25,7 +25,7 @@ export const step1Schemas: FormSchema[] = [
     colProps: { span: 14 },
     componentProps: {
       placeholder: '设备名称',
-      maxLength: 255,
+      maxLength: 36,
     },
   },
   {

@@ -135,12 +135,10 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     component: 'Input',
     colProps: { span: 14 },
-    componentProps() {
-      return {
-        disabled: false,
-        ength: 255,
-        placeholder: '请输入产品名称',
-      };
+    componentProps: {
+      disabled: false,
+      maxLength: 63,
+      placeholder: '请输入产品名称',
     },
   },
   {

@@ -87,7 +87,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     componentProps: {
       placeholder: '请输入标题',
-      maxLength: 200,
+      maxLength: 36,
     },
   },
   {
@@ -96,6 +96,9 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
     label: '通知内容',
     required: true,
+    componentProps: {
+      maxLength: 255,
+    },
     render: ({ model, field }) => {
       return h(Tinymce, {
         value: model[field],

@@ -59,6 +59,7 @@ export const formSchema: FormSchema[] = [
       const { setFieldsValue } = formActionType;
       return {
         placeholder: '请输入标题',
+        maxLength: 36,
         onChange: (value: Event) => {
           setFieldsValue({
             [PackageField.VERSION_TAG]: getVersionTag(
@@ -79,6 +80,7 @@ export const formSchema: FormSchema[] = [
       const { setFieldsValue } = formActionType;
       return {
         placeholder: '请输入版本',
+        maxLength: 36,
         onChange: (value: Event) => {
           setFieldsValue({
             [PackageField.VERSION_TAG]: getVersionTag(
@@ -97,6 +99,7 @@ export const formSchema: FormSchema[] = [
     helpMessage: ['自定义标签应与您设备报告的软件包版本相匹配'],
     componentProps: () => {
       return {
+        maxLength: 36,
         placeholder: '请输入版本标签',
       };
     },
@@ -191,6 +194,7 @@ export const formSchema: FormSchema[] = [
     },
     rules: [{ required: true, message: '外部URL为必填项' }],
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入外部URL',
     },
   },
@@ -238,6 +242,7 @@ export const formSchema: FormSchema[] = [
     },
     helpMessage: ['如果校验和为空,会自动生成'],
     componentProps: {
+      maxLength: 36,
       placeholder: '请输入校验和',
     },
   },
@@ -246,6 +251,7 @@ export const formSchema: FormSchema[] = [
     label: '描述',
     component: 'InputTextArea',
     componentProps: {
+      maxLength: 255,
       placeholder: '请输入描述',
     },
   },

@@ -30,6 +30,7 @@ export enum SchemaFiled {
   ORDER_BY = 'orderBy',
 }
 export const organizationId = ref('');
+
 // 表格配置
 export const columns: BasicColumn[] = [
   {
@@ -147,7 +148,7 @@ export const formSchema: QFormSchema[] = [
     required: true,
     component: 'Input',
     componentProps: {
-      maxLength: 255,
+      maxLength: 64,
       placeholder: '请输入报表名称',
     },
   },
@@ -185,6 +186,11 @@ export const formSchema: QFormSchema[] = [
   {
     field: 'executeWay',
     component: 'RadioGroup',
+    helpMessage: [
+      `立即执行，在创建完报表配置后，启用配置即执行。
+    定时执行，用户定义执行时间，启用后，
+    在满足执行时间条件后，自动执行。`,
+    ],
     label: '执行方式',
     colProps: {
       span: 24,
@@ -225,6 +231,8 @@ export const formSchema: QFormSchema[] = [
             });
           } else {
             setFieldsValue({ queryMode: QueryWay.LATEST });
+            setFieldsValue({ startTs: 5000 });
+            setFieldsValue({ interval: 1000 });
             dataCompareOpions = [{ label: '固定周期', value: QueryWay.LATEST }];
             updateSchema({
               defaultValue: QueryWay.LATEST,
@@ -313,7 +321,6 @@ export const formSchema: QFormSchema[] = [
   {
     field: 'devices',
     label: '设备',
-    helpMessage: ['报表配置只对拥有"数值型"属性的设备才能配置'],
     component: 'Select',
     slot: 'devices',
     colProps: { span: 24 },
@@ -437,7 +444,7 @@ export const formSchema: QFormSchema[] = [
   },
   {
     field: SchemaFiled.START_TS,
-    label: '时间周期',
+    label: '最近时间',
     component: 'Select',
     required: true,
     ifShow({ values }) {
@@ -447,7 +454,7 @@ export const formSchema: QFormSchema[] = [
       const { setFieldsValue } = formActionType;
       return {
         defaultValue: 1000,
-        placeholder: '请选择时间周期',
+        placeholder: '请选择近期时间',
         options: intervalOption,
         onChange() {
           setFieldsValue({ [SchemaFiled.INTERVAL]: null });

@@ -43,7 +43,7 @@
                 <div
                   v-show="!item.notFoundData"
                   :id="`chart-${item.device}`"
-                  :style="{ height, width }"
+                  style="width: 100%; height: 400px"
                 ></div>
               </div>
             </div>

@@ -279,19 +279,28 @@ export const trigger_condition_schema: FormSchema[] = [
     component: 'ApiSelect',
     componentProps: ({ formModel }) => {
       const deviceProfileId = formModel['deviceProfileId'];
-      if (unref(organizationId)) {
-        return {
-          placeholder: '请选择设备',
-          mode: 'multiple',
-          api: byOrganizationIdGetMasterDevice,
-          params: {
-            organizationId: unref(organizationId),
-            deviceProfileId,
-          },
-          labelField: 'name',
-          valueField: 'tbDeviceId',
-        };
-      }
+      return {
+        mode: 'multiple',
+        api: async () => {
+          if (unref(organizationId)) {
+            try {
+              const data = await byOrganizationIdGetMasterDevice({
+                organizationId: unref(organizationId),
+                deviceProfileId,
+              });
+              if (data)
+                return data.map((item) => ({
+                  ...item,
+                  label: item.alias || item.name,
+                  value: item.tbDeviceId,
+                }));
+            } catch (error) {}
+          }
+          return [];
+        },
+        placeholder: '请选择设备',
+        getPopupContainer: () => document.body,
+      };
     },
     ifShow: ({ values }) => isPart(values.device),
     colProps: { span: 6 },
@@ -473,19 +482,28 @@ export const actionSchema: FormSchema[] = [
     component: 'ApiSelect',
     componentProps: ({ formModel }) => {
       const deviceProfileId = formModel['deviceProfileId'];
-      if (unref(organizationId)) {
-        return {
-          placeholder: '请选择设备',
-          mode: 'multiple',
-          api: byOrganizationIdGetMasterDevice,
-          params: {
-            organizationId: unref(organizationId),
-            deviceProfileId,
-          },
-          labelField: 'name',
-          valueField: 'tbDeviceId',
-        };
-      }
+      return {
+        mode: 'multiple',
+        api: async () => {
+          if (unref(organizationId)) {
+            try {
+              const data = await byOrganizationIdGetMasterDevice({
+                organizationId: unref(organizationId),
+                deviceProfileId,
+              });
+              if (data)
+                return data.map((item) => ({
+                  ...item,
+                  label: item.alias || item.name,
+                  value: item.tbDeviceId,
+                }));
+            } catch (error) {}
+          }
+          return [];
+        },
+        placeholder: '请选择设备',
+        getPopupContainer: () => document.body,
+      };
     },
     ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
     colProps: { span: 6 },

@@ -59,7 +59,7 @@ export const formSchema: FormSchema[] = [
     required: true,
     component: 'Input',
     componentProps: {
-      maxLength: 36,
+      maxLength: 32,
       placeholder: '请输入名称',
     },
   },

@@ -13,7 +13,12 @@
         :name="ifAdd ? 'name' : 'params'"
         :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]"
       >
-        <a-input v-if="ifAdd" v-model:value="scriptForm.name" placeholder="请输入脚本名称" />
+        <a-input
+          v-if="ifAdd"
+          :maxlength="36"
+          v-model:value="scriptForm.name"
+          placeholder="请输入脚本名称"
+        />
         <a-input
           @change="handleInputChange"
           v-else
@@ -65,12 +70,14 @@
           v-if="ifAdd"
           v-model:value="scriptForm.description"
           placeholder="请输入备注"
+          :maxlength="255"
         />
         <a-textarea
           :rows="3"
           v-else
           v-model:value="scriptForm.output"
           placeholder="输出参数为服务端返回的内容"
+          :maxlength="255"
         />
       </a-form-item>
     </a-form>
@@ -109,7 +116,7 @@
     typeOptions: [],
     originalOptions: [],
   });
-  const { typeOptions, originalOptions } = toRefs(reportTypeOptions);
+  const { originalOptions, typeOptions } = toRefs(reportTypeOptions);
   const { createMessage } = useMessage();
   const { clipboardRef, copiedRef } = useCopyToClipboard();
   const aceEditor = ref();
@@ -149,7 +156,7 @@
     });
     aceEditor.value.setValue();
     beautify(aceEditor.value.session);
-    scriptForm.convertJs = aceEditor.value.getValue();
+    // scriptForm.convertJs = aceEditor.value.getValue();
   };
   const handleCopy = () => {
     const valueRef = aceEditor.value.getValue();
@@ -184,6 +191,10 @@
       const trimParams = scriptForm.params.replace(/\s*/g, '');
       Reflect.set(value, 'params', trimParams);
     }
+    if (scriptForm.convertJs.length > 1000) {
+      createMessage.error('脚本内容长度不能大于1000');
+      throw '脚本内容长度不能大于1000';
+    }
     return {
       ...value,
       ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null },

@@ -127,7 +127,7 @@ export const accountFormSchema: FormSchema[] = [
     colProps: { span: 12 },
     required: true,
     componentProps: {
-      maxLength: 255,
+      maxLength: 10,
     },
   },
   {
@@ -224,6 +224,10 @@ export const accountFormSchema: FormSchema[] = [
     label: '备注',
     component: 'InputTextArea',
     colProps: { span: 24 },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入备注',
+    },
   },
   {
     field: 'organizationIds',

@@ -47,7 +47,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     required: true,
     componentProps: {
-      maxLength: 255,
+      maxLength: 36,
     },
   },
   {