Merge branch 'ft_local_dev' into 'main'

feat:场景联动 执行动作 新增静态select

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

@@ -75,7 +75,6 @@
   import { Description, useDescription } from '/@/components/Description';
   import { Description, useDescription } from '/@/components/Description';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
-  import { useClipboard } from '@vueuse/core';
 
 
   import wz from '/@/assets/images/wz.png';
   import wz from '/@/assets/images/wz.png';
   export default defineComponent({
   export default defineComponent({
@@ -155,9 +154,11 @@
         const token = await getDeviceToken(props.deviceDetail.tbDeviceId);
         const token = await getDeviceToken(props.deviceDetail.tbDeviceId);
         openModal(true, token);
         openModal(true, token);
       };
       };
-      const { copy } = useClipboard();
       const copyTopic = (val) => {
       const copyTopic = (val) => {
-        copy(val);
+        const { isSuccessRef } = useCopyToClipboard(
+          JSON.parse(JSON.stringify(unref(val), null, 2))
+        );
+        unref(isSuccessRef);
         createMessage.success('复制成功！');
         createMessage.success('复制成功！');
       };
       };
 
 

@@ -4,6 +4,7 @@ import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
 import { scheduleOptions } from './formatData';
 import { scheduleOptions } from './formatData';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { numberAndNonegativeRule } from '/@/utils/rules';
 import { numberAndNonegativeRule } from '/@/utils/rules';
+import { findDictItemByCode } from '/@/api/system/dict';
 
 
 /**
 /**
  * 所使用的枚举值
  * 所使用的枚举值
@@ -161,6 +162,17 @@ const isReplace = (type) => {
 const isPart = (type: string) => {
 const isPart = (type: string) => {
   return type === 'PART';
   return type === 'PART';
 };
 };
+//新增代码2022-11-23
+const isPartOrAll = (type: string) => {
+  return type === 'ALL' || type === 'PART';
+};
+const isService = (type: string) => {
+  return type === 'service';
+};
+const isDefine = (type: string) => {
+  return type === 'custom_define';
+};
+//新增代码2022-11-23
 
 
 export const trigger_condition_schema: FormSchema[] = [
 export const trigger_condition_schema: FormSchema[] = [
   {
   {
@@ -331,6 +343,73 @@ export const actionSchema: FormSchema[] = [
     ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
     ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
+  //新增代码2022-11-23
+  {
+    field: 'customDefine',
+    label: '',
+    required: true,
+    component: 'ApiSelect',
+    colProps: {
+      span: 6,
+    },
+    defaultValue: 'custom_define',
+    componentProps: {
+      placeholder: '请选择类型',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'custom_define',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+      getPopupContainer: () => document.body,
+    },
+    ifShow: ({ values }) => isDeviceOut(values.outTarget) && isPartOrAll(values.device),
+  },
+  //新增代码2022-11-23
+  {
+    field: 'customMode',
+    label: '',
+    required: true,
+    component: 'ApiSelect',
+    colProps: {
+      span: 6,
+    },
+    defaultValue: 'OneWay',
+    componentProps: {
+      placeholder: '请选择类型',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'custom_mode',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+      getPopupContainer: () => document.body,
+    },
+    ifShow: ({ values }) =>
+      isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.customDefine),
+  },
+  //新增代码2022-11-23
+  {
+    field: 'service',
+    label: '',
+    required: true,
+    component: 'ApiSelect',
+    colProps: {
+      span: 6,
+    },
+    componentProps: {
+      placeholder: '请选择服务',
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'attribute_unit',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+      getPopupContainer: () => document.body,
+    },
+    ifShow: ({ values }) => isDeviceOut(values.outTarget) && isService(values.customDefine),
+  },
+  //新增代码2022-11-23
   {
   {
     field: 'alarm_config',
     field: 'alarm_config',
     label: '',
     label: '',
@@ -342,16 +421,22 @@ export const actionSchema: FormSchema[] = [
     ifShow: ({ values }) => values.outTarget === 'MSG_NOTIFY',
     ifShow: ({ values }) => values.outTarget === 'MSG_NOTIFY',
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
+  //新增代码2022-11-23
   {
   {
     field: 'doContext',
     field: 'doContext',
     component: 'Input',
     component: 'Input',
     label: '',
     label: '',
     slot: 'doContext',
     slot: 'doContext',
-    show: ({ values }) => isDeviceOut(values.outTarget),
+    show: ({ values }) => {
+      return (
+        isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.customDefine)
+      );
+    },
     colProps: {
     colProps: {
       span: 24,
       span: 24,
     },
     },
   },
   },
+  //新增代码2022-11-23
   {
   {
     field: 'alarm_level',
     field: 'alarm_level',
     component: 'Select',
     component: 'Select',

@@ -38,8 +38,9 @@
         </a-select>
         </a-select>
       </template>
       </template>
       <template #doContext>
       <template #doContext>
-        <div class="flex">
+        <div class="flex" style="align-items: center">
           <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
           <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
+          <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button>
           <Tooltip
           <Tooltip
             title='{"method":"setDOValue","params":{"devID":"492S211218028819","data":{"DO1":1}}}'
             title='{"method":"setDOValue","params":{"devID":"492S211218028819","data":{"DO1":1}}}'
             class="ml-2"
             class="ml-2"
@@ -129,6 +130,13 @@
       default: '',
       default: '',
     },
     },
   });
   });
+  //新增代码2022-11-23
+  const handlePremitter = () => {
+    const value = unref(jsonInstance).get();
+    if (!value) return;
+    return unref(jsonInstance).set(value);
+  };
+  //新增代码2022-11-23
   const alarmConfigOptions: any = ref([]);
   const alarmConfigOptions: any = ref([]);
   const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
   const [registerAlarmContactDrawer, { openDrawer }] = useDrawer();
   async function handleSuccess() {
   async function handleSuccess() {