diff --git a/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue b/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue
index f6eb65f90..0b7c8f4a2 100644
--- a/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue
+++ b/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue
@@ -65,7 +65,6 @@
               :model-value="condition.operator"
               @update:model-value="(value) => updateConditionField('operator', value)"
               :property-type="propertyType"
-              @change="handleOperatorChange"
             />
           </el-form-item>
         </el-col>
@@ -326,12 +325,4 @@ const handlePropertyChange = (propertyInfo: any) => {
     }
   }
 }
-
-// TODO @puhui999：这个貌似没用上
-/**
- * 处理操作符变化事件
- */
-const handleOperatorChange = () => {
-  // 操作符变化处理
-}
 </script>
diff --git a/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue b/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue
index 0b70c5247..df98de664 100644
--- a/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue
+++ b/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue
@@ -222,7 +222,9 @@ const availableOperators = computed(() => {
   if (!props.propertyType) {
     return allOperators
   }
-  return allOperators.filter((op) => op.supportedTypes.includes(props.propertyType!))
+  return allOperators.filter((op) =>
+    (op.supportedTypes as any[]).includes(props.propertyType || '')
+  )
 })
 
 // 计算属性：当前选中的操作符
@@ -243,10 +245,12 @@ watch(
   () => props.propertyType,
   () => {
     // 如果当前选择的操作符不支持新的属性类型，则清空选择
-    if (localValue.value && selectedOperator.value) {
-      if (!selectedOperator.value.supportedTypes.includes(props.propertyType || '')) {
-        localValue.value = ''
-      }
+    if (
+      localValue.value &&
+      selectedOperator.value &&
+      !(selectedOperator.value.supportedTypes as any[]).includes(props.propertyType || '')
+    ) {
+      localValue.value = ''
     }
   }
 )
diff --git a/src/views/iot/rule/scene/form/selectors/PropertySelector.vue b/src/views/iot/rule/scene/form/selectors/PropertySelector.vue
index 99f05a63f..51f2117a6 100644
--- a/src/views/iot/rule/scene/form/selectors/PropertySelector.vue
+++ b/src/views/iot/rule/scene/form/selectors/PropertySelector.vue
@@ -262,7 +262,6 @@ const handleChange = (value: string) => {
   }
 }
 
-// TODO @puhui999：这里没用到哈；
 /**
  * 获取物模型TSL数据
  */
@@ -297,62 +296,62 @@ const parseThingModelData = () => {
   const tsl = thingModelTSL.value
   const properties: PropertySelectorItem[] = []
 
-  // TODO @puhui999：if return，减少下括号层级；
-  if (tsl) {
-    // 解析属性
-    if (tsl.properties && Array.isArray(tsl.properties)) {
-      tsl.properties.forEach((prop) => {
-        properties.push({
-          identifier: prop.identifier,
-          name: prop.name,
-          description: prop.description,
-          dataType: prop.dataType,
-          type: IoTThingModelTypeEnum.PROPERTY,
-          accessMode: prop.accessMode,
-          required: prop.required,
-          unit: getPropertyUnit(prop),
-          range: getPropertyRange(prop),
-          property: prop
-        })
+  if (!tsl) {
+    propertyList.value = properties
+    return
+  }
+  // 解析属性
+  if (tsl.properties && Array.isArray(tsl.properties)) {
+    tsl.properties.forEach((prop) => {
+      properties.push({
+        identifier: prop.identifier,
+        name: prop.name,
+        description: prop.description,
+        dataType: prop.dataType,
+        type: IoTThingModelTypeEnum.PROPERTY,
+        accessMode: prop.accessMode,
+        required: prop.required,
+        unit: getPropertyUnit(prop),
+        range: getPropertyRange(prop),
+        property: prop
       })
-    }
-
-    // 解析事件
-    if (tsl.events && Array.isArray(tsl.events)) {
-      tsl.events.forEach((event) => {
-        properties.push({
-          identifier: event.identifier,
-          name: event.name,
-          description: event.description,
-          dataType: 'struct',
-          type: IoTThingModelTypeEnum.EVENT,
-          eventType: event.type,
-          required: event.required,
-          outputParams: event.outputParams,
-          event: event
-        })
-      })
-    }
-
-    // 解析服务
-    if (tsl.services && Array.isArray(tsl.services)) {
-      tsl.services.forEach((service) => {
-        properties.push({
-          identifier: service.identifier,
-          name: service.name,
-          description: service.description,
-          dataType: 'struct',
-          type: IoTThingModelTypeEnum.SERVICE,
-          callType: service.callType,
-          required: service.required,
-          inputParams: service.inputParams,
-          outputParams: service.outputParams,
-          service: service
-        })
-      })
-    }
+    })
   }
 
+  // 解析事件
+  if (tsl.events && Array.isArray(tsl.events)) {
+    tsl.events.forEach((event) => {
+      properties.push({
+        identifier: event.identifier,
+        name: event.name,
+        description: event.description,
+        dataType: 'struct',
+        type: IoTThingModelTypeEnum.EVENT,
+        eventType: event.type,
+        required: event.required,
+        outputParams: event.outputParams,
+        event: event
+      })
+    })
+  }
+
+  // 解析服务
+  if (tsl.services && Array.isArray(tsl.services)) {
+    tsl.services.forEach((service) => {
+      properties.push({
+        identifier: service.identifier,
+        name: service.name,
+        description: service.description,
+        dataType: 'struct',
+        type: IoTThingModelTypeEnum.SERVICE,
+        callType: service.callType,
+        required: service.required,
+        inputParams: service.inputParams,
+        outputParams: service.outputParams,
+        service: service
+      })
+    })
+  }
   propertyList.value = properties
 }
 
@@ -396,7 +395,7 @@ const getPropertyRange = (property: any) => {
   return undefined
 }
 
-/** 监听产品变化 *、
+/** 监听产品变化 */
 watch(
   () => props.productId,
   () => {
@@ -410,7 +409,6 @@ watch(
   () => props.triggerType,
   () => {
     localValue.value = ''
-    // el-popover 会自动关闭，无需手动处理
   }
 )
 </script>