Merge branch 'main' into ft

@@ -15,10 +15,10 @@ export enum Number_Operation {
 export enum String_Operation {
   EQUAL = 'EQUAL',
   NOT_EQUAL = 'NOT_EQUAL',
-  BEGAN_IN = 'BEGAN_IN',
-  END_IN = 'END_IN',
-  INCLUDE = 'INCLUDE',
-  NOT_INCLUDE = 'NOT_INCLUDE',
+  BEGAN_IN = 'STARTS_WITH',
+  END_IN = 'ENDS_WITH',
+  INCLUDE = 'CONTAINS',
+  NOT_INCLUDE = 'NOT_CONTAINS',
 }
 
 export enum Boolean_Operation {

@@ -15,7 +15,8 @@ export interface selectionOptions {
   rowKey: string;
   clickToRowSelect: boolean;
   rowSelection: {
-    onChange: (selectedRowKeys: string[]) => void;
+    onSelect: (_, __, selectedRowKeys: string[]) => void;
+    getCheckboxProps: (record: Recordable) => void;
     type: 'radio' | 'checkbox';
   };
 }
@@ -27,7 +28,8 @@ export const useBatchDelete = (
   const selectedRowIds = ref<string[]>([]);
   const hasBatchDelete = computed(() => selectedRowIds.value.length <= 0);
   // 复选框事件
-  const onSelectRowChange = (selectedRowKeys: string[]) => {
+  const onSelectRow = (_, __, selectedRows) => {
+    const selectedRowKeys = selectedRows.map((item) => item.id);
     selectedRowIds.value = selectedRowKeys;
   };
   const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
@@ -41,19 +43,26 @@ export const useBatchDelete = (
       try {
         await deleteFn(selectedRowIds.value);
         createMessage.success('批量删除成功');
-        selectedRowIds.value = [];
+        console.log(selectedRowIds.value);
         handleSuccess();
-      } catch (e) {
-        selectedRowIds.value = [];
-      }
+      } catch (e) {}
+      selectedRowIds.value = [];
     }
   };
   const selectionOptions: selectionOptions = {
     rowKey: 'id',
     clickToRowSelect: false,
     rowSelection: {
-      onChange: onSelectRowChange,
+      onSelect: onSelectRow,
       type: 'checkbox',
+      getCheckboxProps(record: Recordable) {
+        // Demo:status为1的选择框禁用
+        if (record.status === 1) {
+          return { disabled: true };
+        } else {
+          return { disabled: false };
+        }
+      },
     },
   };
   return { hasBatchDelete, selectionOptions, handleDeleteOrBatchDelete };

@@ -17,11 +17,12 @@
         <Divider orientation="left">触发器</Divider>
         <div>
           <template v-for="(item, index) in triggerData" :key="item">
-            <Trigger
+            <TriggerOrCondition
               class="mt-4"
-              :triggerIndex="index"
+              title="触发器"
+              :index="index"
               :ref="skipUnwrap.triggerItemRefs"
-              @deleteTrigger="deleteTrigger"
+              @delete="deleteTriggerOrCondition"
             />
           </template>
           <!-- 按钮 -->
@@ -37,11 +38,12 @@
         <Divider orientation="left">执行条件</Divider>
         <div>
           <template v-for="(item, index) in conditionData" :key="item">
-            <Condition
+            <TriggerOrCondition
               class="mt-4"
-              :conditionIndex="index"
+              title="执行条件"
+              :index="index"
               :ref="skipUnwrap.conditionItemRefs"
-              @deleteCondition="deleteCondition"
+              @delete="deleteTriggerOrCondition"
             />
           </template>
           <!-- 按钮 -->
@@ -92,8 +94,7 @@
     screenLinkPageByDeptIdGetDevice,
     getOrganizationAlarmConfig,
   } from '/@/api/ruleengine/ruleengineApi';
-  import Trigger from './cpns/Trigger.vue';
-  import Condition from './cpns/Condition.vue';
+  import TriggerOrCondition from './cpns/Trigger-Condition.vue';
   import Action from './cpns/Action.vue';
   import { useUserStore } from '/@/store/modules/user';
   import { findOperation } from './config/formatData.ts';
@@ -182,13 +183,17 @@
       triggers.forEach((trigger, index) => {
         nextTick(async () => {
           unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
-            triggered: trigger.triggerCondition.condition.spec.type,
-            device: trigger.entityType,
-            triggerType: trigger.triggerType,
-            type1: trigger.triggerCondition?.condition.condition[0]?.key?.type,
-            type2: trigger.triggerCondition?.condition.condition[0]?.key?.key,
-            operationType: trigger.triggerCondition?.condition.condition[0].valueType,
-            detail: trigger.triggerCondition?.alarmDetails,
+            triggered: trigger?.triggerCondition?.condition?.spec?.type,
+            device: trigger?.entityType,
+            triggerType: trigger?.triggerType,
+            type1: trigger?.triggerCondition?.condition?.condition[0]?.key?.type,
+            type2: trigger?.triggerCondition?.condition?.condition[0]?.key?.key,
+            operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
+            detail: trigger?.triggerCondition?.alarmDetails,
+            entityId: trigger?.entityId,
+            replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
+            time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
+            timeUnit: trigger?.triggerCondition?.condition?.spec?.unit,
           });
           // 设置值operationType
           unref(skipUnwrap.triggerItemRefs)[index].operationType =
@@ -197,7 +202,6 @@
           const ConditionScreeningForm = await unref(skipUnwrap.triggerItemRefs)[
             index
           ].getRefItemConditionScreeningRefs();
-          triggerData.value = [...new Array(triggers.length).keys()];
 
           // 设置对应条件筛选的个数
           unref(skipUnwrap.triggerItemRefs)[index].setConditionScreeningList([
@@ -209,7 +213,7 @@
           // 循环设置条件筛选值。TODO:此处设置顺序有问题
           nextTick(() => {
             const richTextList = [];
-            trigger.triggerCondition.condition.condition.forEach(async (item, index) => {
+            trigger.triggerCondition.condition.condition.forEach((item, index) => {
               const formItem = {
                 operation: item.predicate.operation,
                 value: String(item.predicate.value.defaultValue),
@@ -231,13 +235,17 @@
       doConditions.forEach((condition, index) => {
         nextTick(async () => {
           unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
-            triggered: condition.triggerCondition.condition.spec.type,
-            device: condition.entityType,
-            triggerType: condition.triggerType,
-            type1: condition.triggerCondition?.condition.condition[0]?.key?.type,
-            type2: condition.triggerCondition?.condition.condition[0]?.key?.key,
-            operationType: condition.triggerCondition?.condition.condition[0].valueType,
-            detail: condition.triggerCondition?.alarmDetails,
+            triggered: condition?.triggerCondition?.condition?.spec?.type,
+            device: condition?.entityType,
+            triggerType: condition?.triggerType,
+            type1: condition?.triggerCondition?.condition?.condition[0]?.key?.type,
+            type2: condition?.triggerCondition?.condition?.condition[0]?.key?.key,
+            operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
+            detail: condition?.triggerCondition?.alarmDetails,
+            entityId: condition?.entityId,
+            replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
+            time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
+            timeUnit: condition?.triggerCondition?.condition?.spec?.unit,
           });
           // 设置值operationType
           unref(skipUnwrap.conditionItemRefs)[index].operationType =
@@ -246,7 +254,6 @@
           const ConditionScreeningForm = await unref(skipUnwrap.conditionItemRefs)[
             index
           ].getRefItemConditionScreeningRefs();
-          triggerData.value = [...new Array(condition.length).keys()];
 
           // 设置对应条件筛选的个数
           unref(skipUnwrap.conditionItemRefs)[index].setConditionScreeningList([
@@ -258,7 +265,7 @@
           // 循环设置条件筛选值。TODO:此处设置顺序有问题
           nextTick(() => {
             const richTextList = [];
-            condition.triggerCondition.condition.condition.forEach(async (item, index) => {
+            condition.triggerCondition.condition.condition.forEach((item, index) => {
               const formItem = {
                 operation: item.predicate.operation,
                 value: String(item.predicate.value.defaultValue),
@@ -292,14 +299,25 @@
             unref(skipUnwrap.actionItemRefs)[index].checked = true;
             nextTick(async () => {
               unref(skipUnwrap.actionItemRefs)[index].clearAlarmRef.setFieldsFormValueFun({
-                triggered: action.doContext?.clearRule?.triggerCondition?.condition.spec.type,
-                device: action.entityType,
-                triggerType: action.doContext?.clearRule.triggerType,
-                type1: action.doContext.clearRule.triggerCondition.condition.condition[0].key.type,
-                type2: action.doContext.clearRule.triggerCondition.condition.condition[0].key.key,
+                triggered: action.doContext?.clearRule?.triggerCondition?.condition?.spec?.type,
+                device: action?.entityType,
+                triggerType: action?.doContext?.clearRule?.triggerType,
+                type1:
+                  action?.doContext?.clearRule?.triggerCondition?.condition?.condition[0]?.key
+                    ?.type,
+                type2:
+                  action?.doContext?.clearRule?.triggerCondition?.condition?.condition[0]?.key?.key,
                 operationType:
-                  action.doContext.clearRule.triggerCondition.condition.condition[0].valueType,
-                detail: action.doContext.clearRule.triggerCondition?.alarmDetails,
+                  action?.doContext?.clearRule?.triggerCondition?.condition?.condition[0]
+                    ?.valueType,
+                detail: action?.doContext?.clearRule?.triggerCondition?.alarmDetails,
+                entityId: action?.doContext?.clearRule?.entityId,
+                replaceValue:
+                  action?.doContext?.clearRule?.triggerCondition?.condition?.spec?.predicate
+                    ?.defaultValue,
+                time: action?.doContext?.clearRule?.triggerCondition?.condition?.spec?.predicate
+                  ?.defaultValue,
+                timeUnit: action?.doContext?.clearRule?.triggerCondition?.condition?.spec?.unit,
               });
               // 设置值operationType
 
@@ -309,7 +327,6 @@
               const ConditionScreeningForm = await unref(skipUnwrap.actionItemRefs)[
                 index
               ].getRefItemConditionScreeningRefs();
-              triggerData.value = [...new Array(action.length).keys()];
 
               // // 设置对应条件筛选的个数
               unref(skipUnwrap.actionItemRefs)[index].setConditionScreeningList([
@@ -390,7 +407,6 @@
       item.updateFieldDeviceId(deviceList);
     });
   }
-
   function setAlarmConfig(linkAge, isOrganizationChange = false) {
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
@@ -463,11 +479,12 @@
   };
   const userStore = useUserStore();
   // 删除
-  const deleteTrigger = (triggerIndex: number) => {
-    unref(triggerData).splice(triggerIndex, 1);
-  };
-  const deleteCondition = (conditionIndex: number) => {
-    unref(conditionData).splice(conditionIndex, 1);
+  const deleteTriggerOrCondition = ({ index, title }) => {
+    if (title === '触发器') {
+      unref(triggerData).splice(index, 1);
+    } else if (title === '执行条件') {
+      unref(conditionData).splice(index, 1);
+    }
   };
   const deleteAction = ({ actionIndex, outTarget }) => {
     unref(actionData).splice(actionIndex, 1);

@@ -182,10 +182,10 @@ export const searchFormSchema: FormSchema[] = [
 ];
 // 持续时间
 const isTimeDuration = (type) => {
-  return type === 'timeDuration';
+  return type === 'DURATION';
 };
 const isReplace = (type) => {
-  return type === 'replace';
+  return type === 'REPEATING';
 };
 // 部分
 const isPart = (type: string) => {
@@ -201,8 +201,8 @@ export const trigger_condition_schema: FormSchema[] = [
       placeholder: '请选择触发类型',
       options: [
         { label: '简单', value: 'SIMPLE' },
-        { label: '持续时长', value: 'timeDuration' },
-        { label: '重复次数', value: 'replace' },
+        { label: '持续时长', value: 'DURATION' },
+        { label: '重复次数', value: 'REPEATING' },
       ],
     },
     colProps: { span: 6 },
@@ -235,21 +235,17 @@ export const trigger_condition_schema: FormSchema[] = [
     field: 'time',
     label: '',
     component: 'Input',
-    componentProps: {
-      placeholder: '请输入持续时间',
-    },
     ifShow: ({ values }) => isTimeDuration(values.triggered),
     colProps: { span: 6 },
+    slot: 'time',
   },
   {
     field: 'timeUnit',
     label: '',
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入持续时间单位',
-    },
+    component: 'Select',
+    defaultValue: 'SECONDS',
     ifShow: ({ values }) => isTimeDuration(values.triggered),
-    colProps: { span: 6 },
+    show: false,
   },
   {
     field: 'replaceValue',

 import { formatToDateTime } from '/@/utils/dateUtil';
-
+import { Number_Operation, String_Operation, Boolean_Operation } from '/@/enums/operationEnum';
 // 生成触发器或执行条件JSON数据
 export const genTriggerOrConditionData = (triggerData) => {
   const {
@@ -13,7 +13,11 @@ export const genTriggerOrConditionData = (triggerData) => {
     operationType,
     triggered,
     schedule,
+    time,
+    timeUnit,
+    replaceValue,
   } = triggerData;
+  console.log(time, timeUnit, replaceValue);
   const mapPredicate = predicate?.map((item) => {
     return {
       key: {
@@ -21,15 +25,15 @@ export const genTriggerOrConditionData = (triggerData) => {
         key: type2,
       },
       valueType: operationType,
-      value: null,
+      // value: null,
       predicate: {
         type: operationType === 'DATE_TIME' ? 'NUMERIC' : operationType,
         operation: item.operation,
         value: {
           defaultValue:
             operationType === 'DATE_TIME' ? Number(formatToDateTime(item.value, 'x')) : item.value,
-          userValue: null,
-          dynamicValue: null,
+          // userValue: null,
+          // dynamicValue: null,
         },
       },
     };
@@ -44,12 +48,17 @@ export const genTriggerOrConditionData = (triggerData) => {
         condition: mapPredicate,
         spec: {
           type: triggered,
-          // unit: 'SECONDS',
-          // predicate: {
-          //   defaultValue: 30,
-          //   userValue: null,
-          //   dynamicValue: null,
-          // },
+          unit: triggered === 'DURATION' ? timeUnit : undefined,
+          predicate: {
+            defaultValue:
+              triggered === 'DURATION'
+                ? time
+                : triggered === 'REPEATING'
+                ? replaceValue
+                : undefined,
+            // userValue: null,
+            // dynamicValue: null,
+          },
         },
       },
       schedule: {
@@ -80,8 +89,10 @@ export const genActionData = (conditionData) => {
     schedule,
     entityId,
     deviceId,
-    checked,
+    time,
+    timeUnit,
   } = conditionData;
+
   const mapPredicate = predicate?.map((item) => {
     return {
       key: {
@@ -89,14 +100,14 @@ export const genActionData = (conditionData) => {
         key: type2,
       },
       valueType: operationType,
-      value: null,
+      // value: null,
       predicate: {
         type: operationType,
         operation: item.operation,
         value: {
           defaultValue: item.value,
-          userValue: null,
-          dynamicValue: null,
+          // userValue: null,
+          // dynamicValue: null,
         },
       },
     };
@@ -106,8 +117,7 @@ export const genActionData = (conditionData) => {
       alarmProfileId: alarm_config,
       outTarget,
       entityType: device,
-      entityId: entityId?.length ? entityId : null,
-      deviceId,
+      deviceId: entityId?.length ? entityId : null,
       doContext: mapPredicate?.length
         ? {
             alarmLevel: alarm_level,
@@ -119,12 +129,12 @@ export const genActionData = (conditionData) => {
                   condition: mapPredicate,
                   spec: {
                     type: triggered,
-                    // unit: 'SECONDS',
-                    // predicate: {
-                    //   defaultValue: 30,
-                    //   userValue: null,
-                    //   dynamicValue: null,
-                    // },
+                    unit: timeUnit,
+                    predicate: {
+                      defaultValue: time,
+                      // userValue: null,
+                      // dynamicValue: null,
+                    },
                   },
                 },
                 schedule: {
@@ -145,8 +155,6 @@ export const genActionData = (conditionData) => {
   ];
 };
 
-import { Number_Operation, String_Operation, Boolean_Operation } from '/@/enums/operationEnum';
-
 export const operationNumber_OR_TIME = [
   { label: '等于', value: Number_Operation.EQUAL },
   { label: '不等于', value: Number_Operation.NOT_EQUAL },

@@ -17,6 +17,17 @@
             allowClear
           />
         </template>
+        <template #time="{ model, field }">
+          <Input v-model:value="model[field]" placeholder="请输入持续时间">
+            <template #addonAfter>
+              <Select
+                v-model:value="model[`timeUnit`]"
+                :options="timeUnitOptions"
+                style="width: 60px"
+              />
+            </template>
+          </Input>
+        </template>
       </BasicForm>
       <Card size="small" :bordered="false" style="border: 2px dashed #797979" v-if="operationType">
         <ConditionScreening
@@ -31,7 +42,7 @@
   import { ref, provide } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Radio, Card, Select } from 'ant-design-vue';
+  import { Radio, Card, Select, Input } from 'ant-design-vue';
   import { trigger_condition_schema } from '../config/config.data.ts';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
@@ -103,6 +114,25 @@
       value: 'DATE_TIME',
     },
   ];
+
+  const timeUnitOptions = [
+    {
+      label: '秒',
+      value: 'SECONDS',
+    },
+    {
+      label: '分',
+      value: 'MINUTES',
+    },
+    {
+      label: '时',
+      value: 'HOURS',
+    },
+    {
+      label: '天',
+      value: 'DAYS',
+    },
+  ];
   const childGetFieldsValue = () => getFieldsValue();
   provide('operationType', operationType);
 

 <template>
   <div>
-    <CollapseContainer style="background-color: #f2f2f2" :title="`执行条件${conditionIndex + 1}`">
+    <CollapseContainer style="background-color: #f2f2f2" :title="`${title} ${index + 1}`">
       <template #action>
         <div class="flex">
           <div>
             <span class="mr-2">启用规则</span>
-            <RadioGroup v-model:value="schedule" :options="scheduleOptions" />
+            <RadioGroup
+              v-model:value="schedule"
+              :options="scheduleOptions"
+              @change="handleRadioGroupChange"
+            />
           </div>
           <Tooltip title="移除" class="ml-4">
             <Icon
               icon="fluent:delete-off-20-regular"
               size="20"
               class="mr-2 cursor-pointer"
-              @click="handleDelete(conditionIndex)"
+              @click="handleDelete({ index, title })"
             />
           </Tooltip>
         </div>
@@ -27,6 +31,17 @@
             allowClear
           />
         </template>
+        <template #time="{ model, field }">
+          <Input v-model:value="model[field]" placeholder="请输入持续时间">
+            <template #addonAfter>
+              <Select
+                v-model:value="model[`timeUnit`]"
+                :options="timeUnitOptions"
+                style="width: 60px"
+              />
+            </template>
+          </Input>
+        </template>
       </BasicForm>
       <Card size="small" :bordered="false" style="border: 2px dashed #797979" v-if="operationType">
         <ConditionScreening
@@ -42,19 +57,23 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
-  import { Tooltip, Radio, Card, Select } from 'ant-design-vue';
+  import { Tooltip, Radio, Card, Select, Input } from 'ant-design-vue';
   import { trigger_condition_schema } from '../config/config.data.ts';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   const RadioGroup = Radio.Group;
 
   defineProps({
-    conditionIndex: {
+    title: {
+      type: String,
+      required: true,
+    },
+    index: {
       type: Number,
       required: true,
     },
   });
-  const emit = defineEmits(['deleteCondition']);
+  const emit = defineEmits(['delete']);
   const conditionScreeningRef = ref();
   const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
     schemas: trigger_condition_schema,
@@ -104,8 +123,8 @@
     });
   };
 
-  const handleDelete = (triggerIndex) => {
-    emit('deleteCondition', triggerIndex);
+  const handleDelete = (params: { index: number; title: string }) => {
+    emit('delete', params);
   };
 
   const schedule = ref('ANY_TIME');
@@ -115,7 +134,24 @@
     { label: '自定义启用', value: 'CUSTOM' },
   ];
   const operationType = ref<string>('');
-
+  const timeUnitOptions = [
+    {
+      label: '秒',
+      value: 'SECONDS',
+    },
+    {
+      label: '分',
+      value: 'MINUTES',
+    },
+    {
+      label: '时',
+      value: 'HOURS',
+    },
+    {
+      label: '天',
+      value: 'DAYS',
+    },
+  ];
   const options = [
     {
       label: '数字',
@@ -151,6 +187,17 @@
   const setRichText = (list) => {
     conditionScreeningRef.value.otherAttribute = list;
   };
+
+  const handleRadioGroupChange = (e) => {
+    const { value } = e.target;
+    if (value === 'SPECIFIC_TIME') {
+      console.log('定时启用');
+      // 定时启用
+    } else if (value === 'CUSTOM') {
+      console.log('自定义启用');
+      // 自定义启用
+    }
+  };
   defineExpose({
     getFieldsValueFunc,
     updateFieldDeviceId,

-<template>
-  <div>
-    <CollapseContainer style="background-color: #f2f2f2" :title="`触发器 ${triggerIndex + 1}`">
-      <template #action>
-        <div class="flex">
-          <div>
-            <span class="mr-2">启用规则</span>
-            <RadioGroup v-model:value="schedule" :options="scheduleOptions" />
-          </div>
-          <Tooltip title="移除" class="ml-4">
-            <Icon
-              icon="fluent:delete-off-20-regular"
-              size="20"
-              class="mr-2 cursor-pointer"
-              @click="handleDelete(triggerIndex)"
-            />
-          </Tooltip>
-        </div>
-      </template>
-      <BasicForm @register="registerForm">
-        <template #operationType="{ model, field }">
-          <Select
-            :options="options"
-            v-model:value="model[field]"
-            @change="operationType = model[field]"
-            placeholder="请选择比较类型"
-            allowClear
-          />
-        </template>
-      </BasicForm>
-      <Card size="small" :bordered="false" style="border: 2px dashed #797979" v-if="operationType">
-        <ConditionScreening
-          :childGetFieldsValue="childGetFieldsValue"
-          ref="conditionScreeningRef"
-        />
-      </Card>
-    </CollapseContainer>
-  </div>
-</template>
-<script lang="ts" setup>
-  import { ref, provide, nextTick } from 'vue';
-  import { CollapseContainer } from '/@/components/Container/index';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Icon } from '/@/components/Icon';
-  import { Tooltip, Radio, Card, Select } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config/config.data.ts';
-  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
-  import ConditionScreening from './ConditionScreening.vue';
-  const RadioGroup = Radio.Group;
-
-  defineProps({
-    triggerIndex: {
-      type: Number,
-      required: true,
-    },
-  });
-  const emit = defineEmits(['deleteTrigger']);
-  const conditionScreeningRef = ref();
-  const [registerForm, { resetFields, getFieldsValue, updateSchema, setFieldsValue }] = useForm({
-    schemas: trigger_condition_schema,
-    showActionButtonGroup: false,
-  });
-
-  const getFieldsValueFunc = () => {
-    const predicate = conditionScreeningRef?.value?.refItem?.conditionScreeningRefs?.value?.map(
-      (item) => {
-        return item.getFieldsValue();
-      }
-    );
-    return { ...getFieldsValue(), predicate, schedule: schedule.value };
-  };
-  const updateFieldDeviceId = (deviceList: any[]) => {
-    updateSchema({
-      field: 'entityId',
-      componentProps: {
-        options: deviceList,
-        onChange(e) {
-          if (e) {
-            updateFieldAttributeFunc();
-          }
-        },
-      },
-    });
-  };
-  const resetFieldsValueFunc = () => resetFields();
-  // 回显数据函数
-  const setFieldsFormValueFun = (fieldsValue) => {
-    setFieldsValue(fieldsValue);
-  };
-  const updateFieldAttributeFunc = async () => {
-    const data1 = await getAttribute();
-    const options = data1.map((m) => {
-      return {
-        label: m,
-        value: m,
-      };
-    });
-    updateSchema({
-      field: 'type2',
-      componentProps: {
-        placeholder: '请选择属性',
-        options,
-      },
-    });
-  };
-
-  const handleDelete = (triggerIndex) => {
-    emit('deleteTrigger', triggerIndex);
-  };
-
-  const schedule = ref('ANY_TIME');
-  const scheduleOptions = [
-    { label: '始终启用', value: 'ANY_TIME' },
-    { label: '定时启用', value: 'SPECIFIC_TIME' },
-    { label: '自定义启用', value: 'CUSTOM' },
-  ];
-  const operationType = ref<string>('');
-
-  const options = [
-    {
-      label: '数字',
-      value: 'NUMERIC',
-    },
-    {
-      label: '布尔值',
-      value: 'BOOLEAN',
-    },
-    {
-      label: '字符串',
-      value: 'STRING',
-    },
-    {
-      label: '时间',
-      value: 'DATE_TIME',
-    },
-  ];
-  // 子组件获取父组件的值
-  const childGetFieldsValue = () => getFieldsValue();
-
-  provide('operationType', operationType);
-
-  // 获取conditionScreeningForm的组件
-  const getRefItemConditionScreeningRefs = async () => {
-    await nextTick();
-    return conditionScreeningRef.value.refItem.conditionScreeningRefs;
-  };
-
-  const setConditionScreeningList = (list) => {
-    conditionScreeningRef.value.conditionScreeningList = list;
-  };
-  const setRichText = (list) => {
-    conditionScreeningRef.value.otherAttribute = list;
-  };
-  defineExpose({
-    getFieldsValueFunc,
-    updateFieldDeviceId,
-    resetFieldsValueFunc,
-    setFieldsFormValueFun,
-    childGetFieldsValue,
-    operationType,
-    getRefItemConditionScreeningRefs,
-    setConditionScreeningList,
-    setRichText,
-  });
-</script>

@@ -13,7 +13,6 @@
             {
               label: '查看',
               icon: 'ant-design:eye-outlined',
-              ifShow: record.creator !== userId,
               onClick: handleView.bind(null, record),
             },
             {
@@ -65,6 +64,9 @@
         screenLinkPageDeleteApi,
         handleSuccess
       );
+      const handleLog = (log) => {
+        console.log(log);
+      };
       const userInfo: any = getAuthCache(USER_INFO_KEY);
       const userId = userInfo.userId;
       const role: string = userInfo.roles[0];
@@ -125,6 +127,7 @@
         authBtn,
         role,
         userId,
+        handleLog,
       };
     },
   });