Merge branch 'ft_local_dev' into 'main'

fix:修改Teambition上的问题

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

 import { defHttp } from '/@/utils/http/axios';
 import { ScriptParam, ScriptQueryParam, ScriptRecord } from './model/scriptModel';
 import { PaginationResult } from '/#/axios';
+import { IChangeStatus } from '../ruleengine/model/ruleengineModel';
 
 enum ScriptManagerApi {
   SCRIPT_POST_URL = '/js',
@@ -8,6 +9,7 @@ enum ScriptManagerApi {
   SCRIPT_DELETE_URL = '/js',
   SCRIPT_MELIST_URL = '/js/me/list',
   SCRIPT_TEST_URL = '/js/test',
+  SCRIPT_STATUS = '/js',
 }
 
 export const ScriptPage = (params: ScriptQueryParam) => {
@@ -17,6 +19,16 @@ export const ScriptPage = (params: ScriptQueryParam) => {
   });
 };
 
+/**
+ * 改变转换函数状态
+ * @param params id status
+ */
+export const scriptPagePutApi = (params: IChangeStatus) =>
+  defHttp.post({
+    url: ScriptManagerApi.SCRIPT_STATUS,
+    data: params,
+  });
+
 //删除脚本
 export const deleteScriptManage = (ids: string[]) => {
   return defHttp.delete({

@@ -73,6 +73,7 @@
     },
     value: {
       type: String,
+      default: '',
     },
 
     toolbar: {

@@ -76,7 +76,7 @@ export const chineseAndEnlishRule: Rule[] = [
     required: true,
     validator: (_, value: string) => {
       const reg = /^[a-zA-Z\u4e00-\u9fa5]+$/;
-      if (value === '') {
+      if (value === '' || value === undefined) {
         return Promise.reject('请输入');
       } else if (!reg.test(value)) {
         return Promise.reject('格式不正确');

@@ -123,6 +123,7 @@ export const formSchema: FormSchema[] = [
     field: 'messageMode',
     label: '告警通知方式',
     component: 'ApiSelect',
+    helpMessage: ['通知方式，需在消息管理配置对应告警消息模板，否则不能成功通知告警联系人'],
     required: true,
     componentProps: {
       mode: 'multiple',

@@ -96,7 +96,6 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
     label: '通知内容',
     required: true,
-    defaultValue: '',
     render: ({ model, field }) => {
       return h(Tinymce, {
         value: model[field],

@@ -12,6 +12,13 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+import useCommonFun from '../hooks/useCommonFun';
+
+const { useByProductGetAttribute } = useCommonFun();
+export type TOption = {
+  label: string;
+  value: string;
+};
 
 /**
  * 所使用的枚举值
@@ -212,31 +219,10 @@ export const trigger_condition_schema: FormSchema[] = [
         onChange: async (e) => {
           if (e) {
             setFieldsValue({ type2: '' });
+            setFieldsValue({ entityId: [] });
             const res = await getAttribute(e);
-            let options: any = [];
-            if (Array.isArray(res)) {
-              options = res.map((m) => {
-                return {
-                  label: m?.identifier,
-                  value: m?.identifier,
-                };
-              });
-              updateSchema({
-                field: 'type2',
-                componentProps: {
-                  placeholder: '请选择属性',
-                  options,
-                },
-              });
-            } else {
-              updateSchema({
-                field: 'type2',
-                componentProps: {
-                  placeholder: '请选择属性',
-                  options,
-                },
-              });
-            }
+            const options = ref<TOption[]>([]);
+            useByProductGetAttribute(res, updateSchema, options);
           }
         },
       };
@@ -259,10 +245,22 @@ export const trigger_condition_schema: FormSchema[] = [
   {
     field: 'entityId',
     label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择设备',
-      mode: 'multiple',
+    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: 'id',
+        };
+      }
     },
     ifShow: ({ values }) => isPart(values.device),
     colProps: { span: 6 },
@@ -388,6 +386,7 @@ export const actionSchema: FormSchema[] = [
         getPopupContainer: () => document.body,
         onChange: () => {
           setFieldsValue({ deviceId: [] });
+          setFieldsValue({ thingsModelId: '' });
         },
       };
     },
@@ -511,7 +510,6 @@ export const actionSchema: FormSchema[] = [
         valueField: 'id',
         getPopupContainer: () => document.body,
         onChange: (_, options: ModelOfMatterParams) => {
-          // console.log(options);
           setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });
         },
       };

@@ -141,7 +141,7 @@ export const genActionData = (actionData) => {
       entityType: device ?? 'ALL',
       deviceId: device === 'PART' ? deviceId : null,
       deviceProfileId,
-      commandType,
+      commandType: Number(commandType),
       callType,
       service,
       thingsModelId,

 <template>
-  <BasicModal v-bind="$attrs" :width="600" title="编辑报警日程" centered @register="registerModal" @ok="handleOk"
-    @cancel="handleCancel">
+  <BasicModal
+    v-bind="$attrs"
+    :width="600"
+    :title="isUpdateFlag ? '编辑' + title : '新增' + title"
+    centered
+    @register="registerModal"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
     <BasicForm @register="registerForm" ref="basicFormRef">
       <template #customEnable>
         <template v-for="(item, optionIndex) in options" :key="item.flag">
@@ -8,222 +15,252 @@
             <div class="ml-4 mr-4 flex items-center">
               <Checkbox v-model:checked="item.enabled">星期{{ item.flag }}</Checkbox>
             </div>
-            <TimePicker placeholder="开始时间" v-model:value="item.startsOn" value-format="x" format="HH:mm"
-              :disabled="!item.enabled" />
+            <TimePicker
+              placeholder="开始时间"
+              v-model:value="item.startsOn"
+              value-format="x"
+              format="HH:mm"
+              :disabled="!item.enabled"
+            />
             <span class="ml-4 mr-4 flex items-center">~</span>
-            <TimePicker @change="handleBlur(item.startsOn,item.endsOn)" placeholder="结束时间" v-model:value="item.endsOn"
-              value-format="x" format="HH:mm" :disabled="!item.enabled" />
+            <TimePicker
+              @change="handleBlur(item.startsOn, item.endsOn)"
+              placeholder="结束时间"
+              v-model:value="item.endsOn"
+              value-format="x"
+              format="HH:mm"
+              :disabled="!item.enabled"
+            />
           </div>
         </template>
       </template>
       <template #timing>
-        <TimePicker placeholder="开始时间" v-model:value="timeState.startsOn" value-format="x" format="HH:mm" />
+        <TimePicker
+          placeholder="开始时间"
+          v-model:value="timeState.startsOn"
+          value-format="x"
+          format="HH:mm"
+        />
         <span class="ml-4 mr-4">~</span>
-        <TimePicker @change="handleTimeBlur(timeState.startsOn,timeState.endsOn)" placeholder="结束时间"
-          v-model:value="timeState.endsOn" value-format="x" format="HH:mm" />
+        <TimePicker
+          @change="handleTimeBlur(timeState.startsOn, timeState.endsOn)"
+          placeholder="结束时间"
+          v-model:value="timeState.endsOn"
+          value-format="x"
+          format="HH:mm"
+        />
       </template>
     </BasicForm>
   </BasicModal>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, watch, nextTick } from 'vue';
-import { useModalInner, BasicModal } from '/@/components/Modal';
-import { BasicForm, useForm } from '/@/components/Form';
-import { alarmScheduleSchemas } from '../config/config.data.ts';
-import { Checkbox, TimePicker } from 'ant-design-vue';
-import { useMessage } from '/@/hooks/web/useMessage';
+  import { reactive, ref, watch, nextTick } from 'vue';
+  import { useModalInner, BasicModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { alarmScheduleSchemas } from '../config/config.data';
+  import { Checkbox, TimePicker } from 'ant-design-vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
-const emit = defineEmits(['register', 'cancel']);
-const { createMessage } = useMessage();
-const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
-  showActionButtonGroup: false,
-  schemas: alarmScheduleSchemas,
-});
-const timeState = reactive({
-  startsOn: null,
-  endsOn: null,
-});
-
-const options = ref([
-  {
-    enabled: false,
-    dayOfWeek: 1,
-    flag: '一',
-    endsOn: null,
-    startsOn: null,
-  },
-  {
-    enabled: false,
-    dayOfWeek: 2,
-    flag: '二',
-    endsOn: null,
-    startsOn: null,
-  },
-  {
-    enabled: false,
-    dayOfWeek: 3,
-    flag: '三',
-    endsOn: null,
-    startsOn: null,
-  },
-  {
-    enabled: false,
-    dayOfWeek: 4,
-    flag: '四',
-    endsOn: null,
-    startsOn: null,
-  },
-  {
-    enabled: false,
-    dayOfWeek: 5,
-    flag: '五',
-    endsOn: null,
-    startsOn: null,
-  },
-  {
-    enabled: false,
-    dayOfWeek: 6,
-    flag: '六',
-    endsOn: null,
+  const emit = defineEmits(['register', 'cancel']);
+  const title = ref('');
+  const isUpdateFlag = ref(false);
+  const { createMessage } = useMessage();
+  const [registerForm, { setFieldsValue, getFieldsValue }] = useForm({
+    showActionButtonGroup: false,
+    schemas: alarmScheduleSchemas,
+  });
+  const timeState = reactive({
     startsOn: null,
-  },
-  {
-    enabled: false,
-    dayOfWeek: 7,
-    flag: '日',
     endsOn: null,
-    startsOn: null,
-  },
-]);
-const basicFormRef = ref<InstanceType<typeof BasicForm>>();
-let index = ref(null);
-watch(
-  options,
-  (newValue) => {
-    const arr = [];
-    for (let item of newValue) {
-      if (item.enabled && item.startsOn && item.endsOn) {
-        arr.push(true);
-      } else if ((!item.enabled && item.startsOn && item.endsOn) || item.enabled) {
-        arr.push(false);
+  });
+
+  const options = ref([
+    {
+      enabled: false,
+      dayOfWeek: 1,
+      flag: '一',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 2,
+      flag: '二',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 3,
+      flag: '三',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 4,
+      flag: '四',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 5,
+      flag: '五',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 6,
+      flag: '六',
+      endsOn: null,
+      startsOn: null,
+    },
+    {
+      enabled: false,
+      dayOfWeek: 7,
+      flag: '日',
+      endsOn: null,
+      startsOn: null,
+    },
+  ]);
+  const basicFormRef = ref<InstanceType<typeof BasicForm>>();
+  let index = ref(null);
+  watch(
+    options,
+    (newValue) => {
+      const arr = [];
+      for (let item of newValue) {
+        if (item.enabled && item.startsOn && item.endsOn) {
+          arr.push(true);
+        } else if ((!item.enabled && item.startsOn && item.endsOn) || item.enabled) {
+          arr.push(false);
+        }
       }
+      const flag = arr.length ? !arr.every((item) => item) : true;
+      nextTick(() => {
+        setModalProps({
+          okButtonProps: {
+            disabled: flag,
+          },
+        });
+      });
+    },
+    {
+      deep: true,
     }
-    const flag = arr.length ? !arr.every((item) => item) : true;
-    nextTick(() => {
+  );
+
+  const [registerModal, { closeModal, setModalProps }] = useModalInner((data) => {
+    watch([timeState, basicFormRef.value.formModel], ([timeState, formModel]) => {
       setModalProps({
         okButtonProps: {
-          disabled: flag,
+          disabled:
+            timeState.startsOn === null ||
+            timeState.endsOn === null ||
+            !formModel.daysOfWeek?.length,
         },
       });
+      watch(
+        () => formModel.schedule,
+        () => {
+          timeState.startsOn = null;
+          timeState.endsOn = null;
+        }
+      );
     });
-  },
-  {
-    deep: true,
-  }
-);
+    const { value, currentIndex, isUpdate, scheduleData } = data;
+    isUpdateFlag.value = isUpdate;
+    if (value === 'SPECIFIC_TIME') {
+      title.value = '定时启用';
+    } else {
+      title.value = '自定义启用';
+    }
 
-const [registerModal, { closeModal, setModalProps }] = useModalInner((data) => {
-  watch([timeState, basicFormRef.value.formModel], ([timeState, formModel]) => {
-    setModalProps({
-      okButtonProps: {
-        disabled:
-          timeState.startsOn === null ||
-          timeState.endsOn === null ||
-          !formModel.daysOfWeek?.length,
-      },
+    index.value = currentIndex;
+    const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
+    // 编辑
+    setFieldsValue({
+      schedule: value,
     });
-    watch(
-      () => formModel.schedule,
-      () => {
-        timeState.startsOn = null;
-        timeState.endsOn = null;
-      }
-    );
-  });
-  const { value, currentIndex, isUpdate, scheduleData } = data;
-  index.value = currentIndex;
-  const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
-  // 编辑
-  setFieldsValue({
-    schedule: value,
-  });
-  if (isUpdate) {
-    nextTick(() => {
-      // 回显定时启用
-      if (scheduleData.type === 'SPECIFIC_TIME') {
-        setFieldsValue({
-          daysOfWeek: scheduleData.daysOfWeek,
-        });
-        timeState.startsOn = scheduleData.startsOn + dayZenoTime + '';
-        timeState.endsOn = scheduleData.endsOn + dayZenoTime + '';
-      }
-      // 回显自定义启用
-      if (scheduleData.type === 'CUSTOM') {
-        for (let [index, item] of scheduleData?.items.entries()) {
-          if (item.enabled) {
-            options.value[index].enabled = item.enabled;
-            options.value[index].startsOn = item.startsOn + dayZenoTime + '';
-            options.value[index].endsOn = item.endsOn + dayZenoTime + '';
+    if (isUpdate) {
+      nextTick(() => {
+        // 回显定时启用
+        if (scheduleData.type === 'SPECIFIC_TIME') {
+          setFieldsValue({
+            daysOfWeek: scheduleData.daysOfWeek,
+          });
+          timeState.startsOn = scheduleData.startsOn + dayZenoTime + '';
+          timeState.endsOn = scheduleData.endsOn + dayZenoTime + '';
+        }
+        // 回显自定义启用
+        if (scheduleData.type === 'CUSTOM') {
+          for (let [index, item] of scheduleData?.items.entries()) {
+            if (item.enabled) {
+              options.value[index].enabled = item.enabled;
+              options.value[index].startsOn = item.startsOn + dayZenoTime + '';
+              options.value[index].endsOn = item.endsOn + dayZenoTime + '';
+            }
           }
         }
-      }
-    });
-  }
-});
-const scheduleData = ref({
-  type: 'ANY_TIME',
-});
-const handleBlur = (eS, eE) => {
-  if (eS > eE) {
-    return createMessage.warn('开始时间不能大于结束时间')
-  }
-}
-const handleTimeBlur = (eS, eE) => {
-  if (eS > eE) {
-    return createMessage.warn('开始时间不能大于结束时间')
-  }
-}
-const handleOk = () => {
-  const { schedule: type, timezone, daysOfWeek } = getFieldsValue();
-  // 获取当天0时时间戳
-  const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
-  if (type === 'CUSTOM') {
-    const items = options.value.map((item) => {
-      return {
-        startsOn: item.startsOn ? item.startsOn - dayZenoTime : 0,
-        endsOn: item.endsOn ? item.endsOn - dayZenoTime : 0,
-        dayOfWeek: item.dayOfWeek,
-        enabled: item.enabled,
+      });
+    }
+  });
+  const scheduleData = ref({
+    type: 'ANY_TIME',
+  });
+  const handleBlur = (eS, eE) => {
+    if (eS > eE) {
+      return createMessage.warn('开始时间不能大于结束时间');
+    }
+  };
+  const handleTimeBlur = (eS, eE) => {
+    if (eS > eE) {
+      return createMessage.warn('开始时间不能大于结束时间');
+    }
+  };
+  const handleOk = () => {
+    const { schedule: type, timezone, daysOfWeek } = getFieldsValue();
+    // 获取当天0时时间戳
+    const dayZenoTime = Math.round(new Date(new Date().toLocaleDateString()).getTime());
+    if (type === 'CUSTOM') {
+      const items = options.value.map((item) => {
+        return {
+          startsOn: item.startsOn ? item.startsOn - dayZenoTime : 0,
+          endsOn: item.endsOn ? item.endsOn - dayZenoTime : 0,
+          dayOfWeek: item.dayOfWeek,
+          enabled: item.enabled,
+        };
+      });
+      scheduleData.value = {
+        type,
+        timezone,
+        items,
       };
-    });
-    scheduleData.value = {
-      type,
-      timezone,
-      items,
-    };
-  } else if (type === 'SPECIFIC_TIME') {
-    scheduleData.value = {
-      type,
-      timezone,
-      daysOfWeek,
-      startsOn: timeState.startsOn - dayZenoTime,
-      endsOn: timeState.endsOn - dayZenoTime,
-    };
-  }
-  closeModal();
-};
-const handleCancel = () => {
-  emit('cancel', index.value);
-};
+    } else if (type === 'SPECIFIC_TIME') {
+      scheduleData.value = {
+        type,
+        timezone,
+        daysOfWeek,
+        startsOn: timeState.startsOn - dayZenoTime,
+        endsOn: timeState.endsOn - dayZenoTime,
+      };
+    }
+    closeModal();
+  };
+  const handleCancel = () => {
+    emit('cancel', index.value);
+  };
 
-defineExpose({
-  scheduleData,
-});
+  defineExpose({
+    scheduleData,
+  });
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-time-picker) {
-  width: 12rem;
-}
+  :deep(.ant-time-picker) {
+    width: 12rem;
+  }
 </style>

@@ -62,7 +62,7 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Card, Select, Input, Tooltip } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config/config.data';
+  import { trigger_condition_schema, TOption } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
@@ -70,7 +70,9 @@
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
   import { cloneDeep } from 'lodash-es';
+  import useCommonFun from '../hooks/useCommonFun';
 
+  const { useByProductGetAttribute } = useCommonFun();
   defineProps({
     index: {
       type: Number,
@@ -100,40 +102,8 @@
   };
 
   const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
-    if (isUpdate) {
-      updateSchema({
-        field: 'entityId',
-        componentProps: {
-          options: deviceList,
-        },
-      });
-    }
-    //新增、编辑都会触发onChang事件
-    updateSchema({
-      field: 'device',
-      componentProps: {
-        options: [
-          { label: '全部', value: 'ALL' },
-          { label: '部分', value: 'PART' },
-        ],
-        async onChange(e) {
-          setFieldsValue({ entityId: [] });
-          if (e) {
-            //fengtao
-            if (e == 'ALL') {
-            } else {
-              updateSchema({
-                field: 'entityId',
-                componentProps: {
-                  options: deviceList,
-                },
-              });
-            }
-            //fengtao
-          }
-        },
-      },
-    });
+    console.log(deviceList);
+    console.log(isUpdate);
   };
 
   const resetFieldsValueFunc = () => resetFields();
@@ -143,30 +113,8 @@
   };
   const updateFieldAttributeFunc = async (e) => {
     const res = await getAttribute(e);
-    let options: any = [];
-    if (Array.isArray(res)) {
-      options = res.map((m) => {
-        return {
-          label: m?.identifier,
-          value: m?.identifier,
-        };
-      });
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    } else {
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    }
+    const options = ref<TOption[]>([]);
+    useByProductGetAttribute(res, updateSchema, options);
   };
   //TODO-fengtao
   const schedule = ref('ANY_TIME');

@@ -62,7 +62,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
   import { Tooltip, Card, Select, Input } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config/config.data';
+  import { trigger_condition_schema, TOption } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
   import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
@@ -70,7 +70,9 @@
   import { useModal } from '/@/components/Modal';
   import { cloneDeep } from 'lodash-es';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import useCommonFun from '../hooks/useCommonFun';
 
+  const { useByProductGetAttribute } = useCommonFun();
   defineProps({
     title: {
       type: String,
@@ -111,6 +113,10 @@
     );
     //TODO-fengtao-设备、属性、条件筛选验证
     const validate = getFieldsValue();
+    if (validate.deviceProfileId === undefined) {
+      createMessage.error('请选择产品');
+      throw '请选择产品';
+    }
     if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式');
     if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式');
     if (validate.device == 'PART') {
@@ -140,41 +146,8 @@
 
   //TODO-fengtao
   const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
-    //用于编辑回显
-    if (isUpdate.value) {
-      updateSchema({
-        field: 'entityId',
-        componentProps: {
-          options: deviceList,
-        },
-      });
-    }
-    //新增、编辑都会触发onChang事件
-    updateSchema({
-      field: 'device',
-      componentProps: {
-        options: [
-          { label: '全部', value: 'ALL' },
-          { label: '部分', value: 'PART' },
-        ],
-        async onChange(e) {
-          setFieldsValue({ entityId: [] });
-          if (e) {
-            //fengtao
-            if (e == 'ALL') {
-            } else {
-              updateSchema({
-                field: 'entityId',
-                componentProps: {
-                  options: deviceList,
-                },
-              });
-            }
-            //fengtao
-          }
-        },
-      },
-    });
+    console.log(deviceList);
+    console.log(isUpdate);
   };
   //TODO-fengtao
   const resetFieldsValueFunc = () => {
@@ -188,30 +161,8 @@
   //TODO-fengtao
   const updateFieldAttributeFunc = async (e) => {
     const res = await getAttribute(e);
-    let options: any = [];
-    if (Array.isArray(res)) {
-      options = res.map((m) => {
-        return {
-          label: m?.identifier,
-          value: m?.identifier,
-        };
-      });
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    } else {
-      updateSchema({
-        field: 'type2',
-        componentProps: {
-          placeholder: '请选择属性',
-          options,
-        },
-      });
-    }
+    const options = ref<TOption[]>([]);
+    useByProductGetAttribute(res, updateSchema, options);
   };
   //TODO-fengtao
   const handleDelete = (params: { index: number; title: string }) => {

@@ -188,6 +188,7 @@
       };
     });
     //TODO-fengtao-清除告警验证
+    let productIdIsRequired = false;
     let deviceIdIsRequired = false;
     let attrIsRequired = false;
     let predicateIsRequired = false;
@@ -201,6 +202,9 @@
             deviceIdIsRequired = true;
           }
         }
+        if (s.deviceProfileId === undefined) {
+          productIdIsRequired = true;
+        }
         if (s.type2 == '' || s.type2 == null) {
           attrIsRequired = true;
         }
@@ -229,6 +233,7 @@
         }
       });
     }
+    if (productIdIsRequired) return createMessage.error('请选择产品');
     if (deviceIdIsRequired) return createMessage.error('请选择设备');
     if (attrIsRequired) return createMessage.error('请选择属性');
     if (predicateIsRequired) return createMessage.error('请填写条件筛选');

+export default () => {
+  //根据产品获取对应属性
+  const useByProductGetAttribute = (res, callback, opt) => {
+    const getAttr = (options) =>
+      callback({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          options,
+        },
+      });
+    if (Array.isArray(res)) {
+      opt = res.map((m) => {
+        return {
+          label: m?.identifier,
+          value: m?.identifier,
+        };
+      });
+      getAttr(opt);
+    } else {
+      getAttr(opt);
+    }
+  };
+
+  return {
+    useByProductGetAttribute,
+  };
+};

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
-import { h } from 'vue';
-import { Tag } from 'ant-design-vue';
 
 // 表格配置
 export const columns: BasicColumn[] = [
@@ -14,12 +12,7 @@ export const columns: BasicColumn[] = [
     title: '脚本状态',
     dataIndex: 'status',
     width: 120,
-    customRender: ({ record }) => {
-      const status = record.status;
-      const color = status == 1 ? 'green' : 'red';
-      const text = status == 1 ? '启用' : '禁用';
-      return h(Tag, { color: color }, () => text);
-    },
+    slots: { customRender: 'status' },
   },
   {
     title: '脚本内容',

@@ -49,6 +49,17 @@
           ]"
         />
       </template>
+      <template #status="{ record }">
+        <Switch
+          :checked="record.status === 1"
+          :loading="record.pendingStatus"
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          @change="(checked:boolean)=>statusChange(checked,record)"
+        />
+      </template>
+      <!-- <Authority value="api:yt:js:update:status">
+      </Authority> -->
     </BasicTable>
     <ConverScriptModal @register="registerModal" @success="handleSuccess" />
   </div>
@@ -60,13 +71,18 @@
   import { searchFormSchema, columns } from './config.data';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import ConverScriptModal from './ConverScriptModal.vue';
-  import { ScriptPage, deleteScriptManage } from '/@/api/scriptmanage/scriptManager';
+  import {
+    ScriptPage,
+    deleteScriptManage,
+    scriptPagePutApi,
+  } from '/@/api/scriptmanage/scriptManager';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   const searchInfo = reactive<Recordable>({});
-  const [registerTable, { reload, setProps }] = useTable({
+  const [registerTable, { reload, setProps, setSelectedRowKeys }] = useTable({
     title: '转换脚本列表',
     api: ScriptPage,
     columns,
@@ -94,11 +110,8 @@
     reload();
   };
 
-  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteScriptManage,
-    handleSuccess,
-    setProps
-  );
+  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
+    useBatchDelete(deleteScriptManage, handleSuccess, setProps);
 
   nextTick(() => {
     setProps(selectionOptions);
@@ -147,4 +160,26 @@
       });
     }
   };
+  const statusChange = async (checked, record) => {
+    setProps({
+      loading: true,
+    });
+    setSelectedRowKeys([]);
+    resetSelectedRowKeys();
+    const newStatus = checked ? 1 : 0;
+    const { createMessage } = useMessage();
+    try {
+      await scriptPagePutApi({ id: record.id, status: newStatus });
+      if (newStatus) {
+        createMessage.success(`启用成功`);
+      } else {
+        createMessage.success('禁用成功');
+      }
+    } finally {
+      setProps({
+        loading: false,
+      });
+      reload();
+    }
+  };
 </script>

@@ -57,18 +57,21 @@
                   return f.username == values.username;
                 }
               });
+              console.log(findUserName);
               return [
                 {
                   required: true,
                   validator(_, value) {
                     return new Promise((resolve, reject) => {
-                      if (value == '') {
+                      console.log(value);
+                      if (value == '' || value === undefined) {
                         reject('请输入账号');
                       } else if (ChineseRegexp.test(value)) {
                         reject('账号不能含有中文');
                       } else if (EmailRegexp.test(value)) {
                         reject('账号不能为电子邮箱格式');
-                      } else if (value == findUserName?.username) {
+                      } else if (findUserName && value == findUserName?.username) {
+                        console.log(1111111111);
                         reject('账号已存在');
                         return;
                       } else {
@@ -88,6 +91,7 @@
           component: 'Input',
           componentProps: {
             maxLength: 255,
+            placeholder: '请输入真实名字',
           },
           rules: chineseAndEnlishRule,
         },
@@ -129,6 +133,7 @@
           await resetFields();
           isUpdate.value = !!data?.isUpdate;
           tenantId.value = data?.tenantId;
+          console.log(data.judgeExistUserName);
           isJudgeUserNameExist.value = data.judgeExistUserName;
           if (unref(isUpdate)) {
             await updateSchema({ field: 'username', componentProps: { disabled: true } });