fix: bug#9193

src/pages/rule-engine/Scene/Save/action/ListItem/FilterGroup.tsx

@@ -66,6 +66,9 @@ export default observer((props: TermsProps) => {
               value={props.data.type}
               onChange={(v) => {
                 props.data.type = v;
+                const typeLabel = v === 'and' ? '并且' : '或者';
+                labelRef.current.termType = typeLabel;
+                props.onLabelChange(labelRef.current);
               }}
             />
           </div>
@@ -174,10 +177,11 @@ export default observer((props: TermsProps) => {
                       props.onColumnsChange(optionsColumnsRef.current);
                     }}
                     onLabelChange={(options) => {
-                      let newLabel: any = [];
+                      let newLabel: any = {};
                       const typeLabel = props.data.type === 'and' ? '并且' : '或者';
                       if (labelRef.current?.terms) {
                         labelRef.current?.terms.splice(index, 1, options);
+                        labelRef.current.termType = typeLabel;
                         newLabel = labelRef.current;
                       } else {
                         newLabel = {

src/pages/rule-engine/Scene/Save/device/product.tsx

@@ -241,7 +241,7 @@ export default observer(() => {
           onChange: (_, selectedRows) => {
             TriggerDeviceModel.productId = selectedRows.map((item) => item.id)[0];
             TriggerDeviceModel.productDetail = selectedRows?.[0];
-            handleMetadata(TriggerDeviceModel.productDetail.metadata);
+            handleMetadata(TriggerDeviceModel.productDetail?.metadata);
             // 初始化选择设备类型以及触发类型
             TriggerDeviceModel.deviceKeys = [];
             TriggerDeviceModel.orgId = '';

src/pages/rule-engine/Scene/Save/terms/term.tsx

@@ -65,6 +65,8 @@ export default observer((props: TermsProps) => {
               value={props.data.type}
               onChange={(v) => {
                 props.data.type = v;
+                FormModel.current.options!.when[props.whenName].terms[props.name].termType =
+                  v === 'and' ? '并且' : '或者';
               }}
             />
           </div>