Merge branch 'main_dev' into ft

@@ -7,6 +7,7 @@ export interface ConfigurationCenterItemsModal {
   creator: string;
   creator: string;
   remark: string;
   remark: string;
   publicId?: string;
   publicId?: string;
+  organizationId?: string;
 }
 }
 export type queryPageParams = BasicPageParams & {
 export type queryPageParams = BasicPageParams & {
   name?: Nullable<string>;
   name?: Nullable<string>;

@@ -56,7 +56,10 @@
           return unref(orgList);
           return unref(orgList);
         }
         }
       },
       },
-      params: { ...params, _t: unref(timespan) },
+      params: {
+        ...params,
+        _t: unref(timespan),
+      },
       onChange: (...args: any[]) => {
       onChange: (...args: any[]) => {
         emit('change', ...args);
         emit('change', ...args);
       },
       },

@@ -136,13 +136,19 @@
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getPreviewFlag)) return;
     if (!unref(getPreviewFlag)) return;
     window.open(
     window.open(
-      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}&lightbox=1`
+      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
+        record!.id
+      }&lightbox=1&organizationId=${record.organizationId}`
     );
     );
   };
   };
 
 
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getDesignFlag)) return;
     if (!unref(getDesignFlag)) return;
-    window.open(`${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}`);
+    window.open(
+      `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
+        record!.id
+      }&organizationId=${record.organizationId}`
+    );
   };
   };
 
 
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
@@ -165,6 +171,7 @@
     searchParams.set('configurationId', record.id);
     searchParams.set('configurationId', record.id);
     searchParams.set('publicId', record.publicId || '');
     searchParams.set('publicId', record.publicId || '');
     searchParams.set('lightbox', '1');
     searchParams.set('lightbox', '1');
+    searchParams.set('organizationId', record!.organizationId || '');
     return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
     return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
   };
   };
 
 

@@ -31,9 +31,9 @@
   import { CredentialsEnum } from '../mqtt/enum';
   import { CredentialsEnum } from '../mqtt/enum';
 
 
   const credentialsFile = reactive({
   const credentialsFile = reactive({
-    caCertFileName: '',
-    certFileName: '',
-    privateKeyFileName: '',
+    caCertFileName: undefined,
+    certFileName: undefined,
+    privateKeyFileName: undefined,
   });
   });
 
 
   const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
   const [register, { validateFields, setFieldsValue, resetFields }] = useForm({
@@ -50,6 +50,11 @@
   const getValue = async () => {
   const getValue = async () => {
     const values = await validateFields();
     const values = await validateFields();
     if (!values) return;
     if (!values) return;
+    // if (values.type == 'anonymous' || values.type == 'basic') {
+    //   credentialsFile.caCertFileName = undefined;
+    //   credentialsFile.certFileName = undefined;
+    //   credentialsFile.privateKeyFileName = undefined;
+    // }
     const credentials = {
     const credentials = {
       type: values['type'],
       type: values['type'],
       ...credentialsFile,
       ...credentialsFile,

@@ -51,10 +51,16 @@
   const getValue = async () => {
   const getValue = async () => {
     const values = await validateFields();
     const values = await validateFields();
     if (!values) return;
     if (!values) return;
+    if (values.type == 'anonymous' || values.type == 'basic') {
+      credentialsFile.caCertFileName = undefined;
+      credentialsFile.certFileName = undefined;
+      credentialsFile.privateKeyFileName = undefined;
+    }
     const credentials = {
     const credentials = {
       type: values['type'],
       type: values['type'],
       ...credentialsFile,
       ...credentialsFile,
     };
     };
+
     const mergeValues = {
     const mergeValues = {
       ...values,
       ...values,
       ...{ credentials },
       ...{ credentials },
@@ -67,7 +73,12 @@
     if (credentials) {
     if (credentials) {
       for (let i in credentials) Reflect.set(credentialsFile, i, credentials[i]);
       for (let i in credentials) Reflect.set(credentialsFile, i, credentials[i]);
     }
     }
-    setFieldsValue({ ...value, type: credentials.type });
+    setFieldsValue({
+      ...value,
+      type: credentials.type,
+      username: credentials.username,
+      password: credentials.password,
+    });
   };
   };
 
 
   const resetValue = () => resetFields();
   const resetValue = () => resetFields();

@@ -18,7 +18,7 @@ class MqttFormPartialConfig {
     return [
     return [
       { label: 'Anonymous', value: 'anonymous' },
       { label: 'Anonymous', value: 'anonymous' },
       { label: 'Basic', value: 'basic' },
       { label: 'Basic', value: 'basic' },
-      { label: 'PEM', value: 'pem' },
+      { label: 'PEM', value: 'cert.PEM' },
     ];
     ];
   }
   }
 }
 }
@@ -138,9 +138,21 @@ export const modeMqttForm: FormSchema[] = [
     label: '凭据类型',
     label: '凭据类型',
     colProps: { span: 12 },
     colProps: { span: 12 },
     defaultValue: MqttFormPartialConfig.type,
     defaultValue: MqttFormPartialConfig.type,
-    componentProps: {
-      placeholder: '请选择Credentials',
-      options: MqttFormPartialConfig.getType(),
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择Credentials',
+        options: MqttFormPartialConfig.getType(),
+        onChange(e) {
+          if (e) {
+            console.log('执行');
+            setFieldsValue({
+              password: undefined,
+              username: undefined,
+            });
+          }
+        },
+      };
     },
     },
   },
   },
   {
   {

@@ -6,7 +6,7 @@
 export enum CredentialsEnum {
 export enum CredentialsEnum {
   IS_ANONYMOUS = 'anonymous',
   IS_ANONYMOUS = 'anonymous',
   IS_BASIC = 'basic',
   IS_BASIC = 'basic',
-  IS_PEM = 'pem',
+  IS_PEM = 'cert.PEM',
 }
 }
 
 
 export const isBasic = (type: string) => {
 export const isBasic = (type: string) => {

@@ -128,8 +128,9 @@
             : undefined,
             : undefined,
           appendClientIdSuffix: getDataFlowParams.appendClientIdSuffix || undefined,
           appendClientIdSuffix: getDataFlowParams.appendClientIdSuffix || undefined,
           type: undefined,
           type: undefined,
+          username: undefined,
+          password: undefined,
         };
         };
-
         const rest = isRabbitmq(getDataFlowMethod?.type)
         const rest = isRabbitmq(getDataFlowMethod?.type)
           ? await postAddConvertApi({ ...restData.data, ...data })
           ? await postAddConvertApi({ ...restData.data, ...data })
           : await postAddConvertApi({ ...restData.data, ...data, configuration });
           : await postAddConvertApi({ ...restData.data, ...data, configuration });

@@ -755,6 +755,18 @@ export const actionSchema: FormSchema[] = [
     component: 'Select',
     component: 'Select',
     label: '',
     label: '',
     show: ({ values }) => isAlarmOut(values.outTarget),
     show: ({ values }) => isAlarmOut(values.outTarget),
+    // dynamicRules: (params) => {
+    //   const { outTarget } = params.values;
+    //   return [
+    //     {
+    //       required: outTarget == 'MSG_NOTIFY' ? true : false,
+    //       validator: (_, value) => {
+    //         if (!value) return Promise.reject('请选择告警配置');
+    //         Promise.resolve();
+    //       },
+    //     },
+    //   ];
+    // },
     componentProps: {
     componentProps: {
       placeholder: '请选择告警等级',
       placeholder: '请选择告警等级',
       options: [
       options: [

@@ -273,6 +273,10 @@
       if (validate.device == 'PART' && validate.deviceId == undefined)
       if (validate.device == 'PART' && validate.deviceId == undefined)
         return createMessage.error('请选择设备');
         return createMessage.error('请选择设备');
     }
     }
+    if (type === 'MSG_NOTIFY') {
+      if (!validate.alarm_config) return createMessage.error('请选择告警配置');
+      if (!validate.alarm_level) return createMessage.error('请选择告警等级');
+    }
     //ft-add-2022-11-22
     //ft-add-2022-11-22
     //TODO-fengtao-设备验证
     //TODO-fengtao-设备验证
     const value = getFieldsValue();
     const value = getFieldsValue();

@@ -2,7 +2,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { formSchemas } from './config';
   import { formSchemas } from './config';
-  import { ref } from 'vue';
+  import { nextTick, ref } from 'vue';
   import { composeData, parseData } from './util';
   import { composeData, parseData } from './util';
   import { createTask, updateTask } from '/@/api/task';
   import { createTask, updateTask } from '/@/api/task';
   import { ModalParamsType } from '/#/utils';
   import { ModalParamsType } from '/#/utils';
@@ -33,7 +33,10 @@
       modalMode.value = mode;
       modalMode.value = mode;
       dataSource.value = record;
       dataSource.value = record;
       formMode.value = mode;
       formMode.value = mode;
-      resetFields();
+      resetFields().then(async () => {
+        await nextTick();
+        clearValidate();
+      });
       if (record && mode === DataActionModeEnum.UPDATE) {
       if (record && mode === DataActionModeEnum.UPDATE) {
         const res = parseData(record);
         const res = parseData(record);
         setFieldsValue({ ...res });
         setFieldsValue({ ...res });
@@ -41,13 +44,14 @@
     }
     }
   );
   );
 
 
-  const [registerForm, { getFieldsValue, validate, setFieldsValue, resetFields }] = useForm({
-    schemas: formSchemas,
-    showActionButtonGroup: false,
-    layout: 'inline',
-    baseColProps: { span: 24 },
-    labelWidth: 140,
-  });
+  const [registerForm, { getFieldsValue, validate, setFieldsValue, resetFields, clearValidate }] =
+    useForm({
+      schemas: formSchemas,
+      showActionButtonGroup: false,
+      layout: 'inline',
+      baseColProps: { span: 24 },
+      labelWidth: 140,
+    });
 
 
   const loading = ref(false);
   const loading = ref(false);
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();

@@ -124,7 +124,6 @@ export const parseData = (result: TaskRecordType): Required<FormValueType> => {
     TaskRecordType['executeTarget']
     TaskRecordType['executeTarget']
   >;
   >;
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
   const { type: executeTimeType, period, periodType, time, pollUnit } = executeTime;
-  console.log(pushWay === PushWayEnum.MQTT ? JSON.stringify(rpcCommand, null, 2) : rpcCommand);
   return {
   return {
     name,
     name,
     targetType,
     targetType,

@@ -188,7 +188,9 @@
     if (hasDetailPermission) {
     if (hasDetailPermission) {
       const boardId = encode(record.id);
       const boardId = encode(record.id);
       const boardName = encode(record.name);
       const boardName = encode(record.name);
-      router.push(`/visual/board/detail/${boardId}/${boardName}`);
+      const organizationId = encode(record?.organizationId);
+
+      router.push(`/visual/board/detail/${boardId}/${boardName}/${organizationId}`);
     } else createMessage.warning('没有权限');
     } else createMessage.warning('没有权限');
   };
   };
 
 

@@ -90,6 +90,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
   const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
   const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
   const selectWidgetKeys = useSelectWidgetKeys();
   const selectWidgetKeys = useSelectWidgetKeys();
   const category = unref(selectWidgetKeys).categoryKey;
   const category = unref(selectWidgetKeys).categoryKey;
+
   return [
   return [
     {
     {
       field: DataSourceField.IS_GATEWAY_DEVICE,
       field: DataSourceField.IS_GATEWAY_DEVICE,
@@ -191,6 +192,9 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             });
             });
           },
           },
           showCreate: false,
           showCreate: false,
+          apiTreeSelectProps: {
+            params: { organizationId: location?.pathname?.split('/')?.pop() || '' },
+          },
           getPopupContainer: () => document.body,
           getPopupContainer: () => document.body,
         };
         };
       },
       },